summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/tsc.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2008-10-30 16:05:39 -0500
committerIngo Molnar <mingo@elte.hu>2008-10-30 22:53:10 +0100
commit017d9d20d88cacb0a6a29f343b23c95e203f6645 (patch)
treee1ccf9369104a5249988e12e9692f3dfc7f943cd /arch/x86/kernel/tsc.c
parent08c33308575b370c89b4ed1198ece5f93145a2aa (diff)
downloadop-kernel-dev-017d9d20d88cacb0a6a29f343b23c95e203f6645.zip
op-kernel-dev-017d9d20d88cacb0a6a29f343b23c95e203f6645.tar.gz
x86: use CONFIG_X86_SMP instead of CONFIG_SMP
Impact: fix x86/Voyager boot CONFIG_SMP is used for features which work on *all* x86 boxes. CONFIG_X86_SMP is used for standard PC like x86 boxes (for things like multi core and apics) Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/tsc.c')
-rw-r--r--arch/x86/kernel/tsc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 161bb85..62348e4 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -759,7 +759,7 @@ __cpuinit int unsynchronized_tsc(void)
if (!cpu_has_tsc || tsc_unstable)
return 1;
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_SMP
if (apic_is_clustered_box())
return 1;
#endif
OpenPOWER on IntegriCloud