Commit 017d9d20 authored by James Bottomley's avatar James Bottomley Committed by Ingo Molnar

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: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 08c33308
...@@ -69,7 +69,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) ...@@ -69,7 +69,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)
*/ */
void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_X86_SMP
unsigned int eax, ebx, ecx, edx, sub_index; unsigned int eax, ebx, ecx, edx, sub_index;
unsigned int ht_mask_width, core_plus_mask_width; unsigned int ht_mask_width, core_plus_mask_width;
unsigned int core_select_mask, core_level_siblings; unsigned int core_select_mask, core_level_siblings;
......
...@@ -759,7 +759,7 @@ __cpuinit int unsynchronized_tsc(void) ...@@ -759,7 +759,7 @@ __cpuinit int unsynchronized_tsc(void)
if (!cpu_has_tsc || tsc_unstable) if (!cpu_has_tsc || tsc_unstable)
return 1; return 1;
#ifdef CONFIG_SMP #ifdef CONFIG_X86_SMP
if (apic_is_clustered_box()) if (apic_is_clustered_box())
return 1; return 1;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment