diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 21:21:59 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-27 08:35:19 +0100 |
commit | 1b49061d400c9e51e3ac2aac026a099fe599b9bb (patch) | |
tree | 54c632cd7f0be2573897c1463a247e69fb769940 /arch | |
parent | 14131f2f98ac350ee9e73faed916d2238a8b6a0d (diff) | |
parent | 83ce400928680a6c8123d492684b27857f5a2d95 (diff) | |
download | blackbird-op-linux-1b49061d400c9e51e3ac2aac026a099fe599b9bb.tar.gz blackbird-op-linux-1b49061d400c9e51e3ac2aac026a099fe599b9bb.zip |
Merge branch 'sched/clock' into tracing/ftrace
Conflicts:
kernel/sched_clock.c
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/cpu/intel.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 24ff26a38ade..5fff00c70de0 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -4,6 +4,7 @@ #include <linux/string.h> #include <linux/bitops.h> #include <linux/smp.h> +#include <linux/sched.h> #include <linux/thread_info.h> #include <linux/module.h> @@ -56,11 +57,16 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) /* * c->x86_power is 8000_0007 edx. Bit 8 is TSC runs at constant rate - * with P/T states and does not stop in deep C-states + * with P/T states and does not stop in deep C-states. + * + * It is also reliable across cores and sockets. (but not across + * cabinets - we turn it off in that case explicitly.) */ if (c->x86_power & (1 << 8)) { set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC); + set_cpu_cap(c, X86_FEATURE_TSC_RELIABLE); + sched_clock_stable = 1; } } |