x86: use CONFIG_X86_SMP instead of CONFIG_SMP
PATCH 1/1 x86: use CONFIG_X86_SMP instead of CONFIG_SMP
Quoted 1 line
From
6e5fbb4691fd68f5b03608c5d8d96e4f189e623aMon Sep 17 00:00:00 2001
From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 13:11:48 -0500
Subject: [VOYAGER] x86: use CONFIG_X86_SMP instead of CONFIG_SMP
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)
--- arch/x86/kernel/cpu/addon_cpuid_features.c | 2 +- arch/x86/kernel/tsc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/addon_cpuid_features.c +1 -1
@@ -69,7 +69,7 @@ void __cpuinit init_scattered_cpuid_features(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 ht_mask_width, core_plus_mask_width;unsigned int core_select_mask, core_level_siblings;
arch/x86/kernel/tsc.c +1 -1
@@ -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
Signature · 1 line
1.5.6.5
Quoted 8 lines · James Bottomley
Quoted 1 line
From
6e5fbb4691fd68f5b03608c5d8d96e4f189e623aMon Sep 17 00:00:00 2001From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 13:11:48 -0500
Subject: [VOYAGER] x86: useCONFIG_X86_SMPinstead ofCONFIG_SMP
CONFIG_SMPis used for features which work on *all* x86 boxes.CONFIG_X86_SMPis used for standard PC like x86 boxes (for things like multi core and apics)
i've applied your fix to tip/x86/urgent, as it's obviously correct in the current scheme of things, thanks!
but that needless build-time distinction should go away. We can now support a whole host of 'weird' SMP boxes via genapic and x86_quirks.
Ingo