diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 17:07:08 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-29 14:17:00 +0100 |
commit | 3e5095d15276efd14a45393666b1bb7536bf179f (patch) | |
tree | 830cd4cd2803e44a99629b6f2c3307b4c82dd302 /arch/x86/kernel/apic.c | |
parent | f2fc0e3071230bb9ea9f64a08c3e619ad1357cfb (diff) | |
download | op-kernel-dev-3e5095d15276efd14a45393666b1bb7536bf179f.zip op-kernel-dev-3e5095d15276efd14a45393666b1bb7536bf179f.tar.gz |
x86: replace CONFIG_X86_SMP with CONFIG_SMP
The x86/Voyager subarch used to have this distinction between
'x86 SMP support' and 'Voyager SMP support':
config X86_SMP
bool
depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
This is a pointless distinction - Voyager can (and already does) use
smp_ops to implement various SMP quirks it has - and it can be extended
more to cover all the specialities of Voyager.
So remove this complication in the Kconfig space.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic.c')
-rw-r--r-- | arch/x86/kernel/apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 81efe86..968c817 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c @@ -1900,7 +1900,7 @@ void __cpuinit generic_processor_info(int apicid, int version) } #endif -#if defined(CONFIG_X86_SMP) || defined(CONFIG_X86_64) +#if defined(CONFIG_SMP) || defined(CONFIG_X86_64) early_per_cpu(x86_cpu_to_apicid, cpu) = apicid; early_per_cpu(x86_bios_cpu_apicid, cpu) = apicid; #endif |