diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 09:50:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 16:20:20 -0400 |
| commit | 80c5520811d3805adcb15c570ea5e2d489fa5d0b (patch) | |
| tree | ae797a7f4af39f80e77526533d06ac23b439f0ab /arch/x86/kernel/tsc.c | |
| parent | b3e3b302cf6dc8d60b67f0e84d1fa5648889c038 (diff) | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
Merge branch 'cpus4096' into irq/threaded
Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 d5cebb52d45b..462b9ba67e92 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -793,7 +793,7 @@ __cpuinit int unsynchronized_tsc(void) | |||
| 793 | if (!cpu_has_tsc || tsc_unstable) | 793 | if (!cpu_has_tsc || tsc_unstable) |
| 794 | return 1; | 794 | return 1; |
| 795 | 795 | ||
| 796 | #ifdef CONFIG_X86_SMP | 796 | #ifdef CONFIG_SMP |
| 797 | if (apic_is_clustered_box()) | 797 | if (apic_is_clustered_box()) |
| 798 | return 1; | 798 | return 1; |
| 799 | #endif | 799 | #endif |