summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-25 08:40:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-25 08:40:56 -0700
commit5e686019df425a4fd8003ce7f6eaccbe537331d8 (patch)
treecc78762bc0fb471562ca1b5f745834a983020623 /arch/x86/include
parente09b4e9a8d15dce04bedf1b860abeec00de31aad (diff)
parentcd7240c0b900eb6d690ccee088a6c9b46dae815a (diff)
downloadop-kernel-dev-5e686019df425a4fd8003ce7f6eaccbe537331d8.zip
op-kernel-dev-5e686019df425a4fd8003ce7f6eaccbe537331d8.tar.gz
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')
-rw-r--r--arch/x86/include/asm/tsc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
index c042729..1ca132f 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 */
OpenPOWER on IntegriCloud