leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: use CONFIG_X86_SMP instead of CONFIG_SMP

Browse Source 
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>
This commit is contained in:
James Bottomley 2008-10-30 16:05:39 -05:00 committed by Ingo Molnar
parent 08c3330857
commit 017d9d20d8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/cpu/addon_cpuid_features.c
View File

@ -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;

2
arch/x86/kernel/tsc.c
View File

@ -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