diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-08 11:48:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-08 11:48:51 -0400 |
| commit | dba58e39ced7af63f2748d12bbb2b4ac83c72391 (patch) | |
| tree | ee15a5e7667b51d0d0f7e8cb39064652f7c84c28 /arch/x86/kernel/tsc.c | |
| parent | 9de36825b321fe9fe9cf73260554251af579f4ca (diff) | |
| parent | 78ff7fae04554b49d29226ed12536268c2500d1f (diff) | |
Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedit' into tracing/core
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 599e58168631..83d53ce5d4c4 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -773,7 +773,7 @@ __cpuinit int unsynchronized_tsc(void) | |||
| 773 | if (!cpu_has_tsc || tsc_unstable) | 773 | if (!cpu_has_tsc || tsc_unstable) |
| 774 | return 1; | 774 | return 1; |
| 775 | 775 | ||
| 776 | #ifdef CONFIG_X86_SMP | 776 | #ifdef CONFIG_SMP |
| 777 | if (apic_is_clustered_box()) | 777 | if (apic_is_clustered_box()) |
| 778 | return 1; | 778 | return 1; |
| 779 | #endif | 779 | #endif |