diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 17:40:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 17:40:56 +0200 |
| commit | 5e686019df425a4fd8003ce7f6eaccbe537331d8 (patch) | |
| tree | cc78762bc0fb471562ca1b5f745834a983020623 /arch/x86/include/asm | |
| parent | Merge branch 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | x86, tsc, sched: Recompute cyc2ns_offset's during resume from sleep states (diff) | |
| download | linux-5e686019df425a4fd8003ce7f6eaccbe537331d8.tar.xz linux-5e686019df425a4fd8003ce7f6eaccbe537331d8.zip | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, tsc, sched: Recompute cyc2ns_offset's during resume from sleep states
sched: Fix rq->clock synchronization when migrating tasks
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/tsc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h index c0427295e8f5..1ca132fc0d03 100644 --- a/arch/x86/include/asm/tsc.h +++ b/arch/x86/include/asm/tsc.h @@ -59,5 +59,7 @@ extern void check_tsc_sync_source(int cpu); extern void check_tsc_sync_target(void); extern int notsc_setup(char *); +extern void save_sched_clock_state(void); +extern void restore_sched_clock_state(void); #endif /* _ASM_X86_TSC_H */ |