diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
| commit | db5935001a43528e673ad26ffec9d98c60a496a9 (patch) | |
| tree | 8e735327a97beccabb5d94ef93df25d2bacda705 /arch/x86/kernel/tsc.c | |
| parent | 34f3a814eef8069a24e5b3ebcf27aba9dabac2ea (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into sched/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 161bb850fc47..62348e4fd8d1 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -759,7 +759,7 @@ __cpuinit int unsynchronized_tsc(void) | |||
| 759 | if (!cpu_has_tsc || tsc_unstable) | 759 | if (!cpu_has_tsc || tsc_unstable) |
| 760 | return 1; | 760 | return 1; |
| 761 | 761 | ||
| 762 | #ifdef CONFIG_SMP | 762 | #ifdef CONFIG_X86_SMP |
| 763 | if (apic_is_clustered_box()) | 763 | if (apic_is_clustered_box()) |
| 764 | return 1; | 764 | return 1; |
| 765 | #endif | 765 | #endif |