aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-27 11:07:08 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-29 08:17:00 -0500
commit3e5095d15276efd14a45393666b1bb7536bf179f (patch)
tree830cd4cd2803e44a99629b6f2c3307b4c82dd302 /arch/x86/kernel/setup.c
parentf2fc0e3071230bb9ea9f64a08c3e619ad1357cfb (diff)
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/setup.c')
-rw-r--r--arch/x86/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index e645d4793e4d..eeb180b1d7aa 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -588,7 +588,7 @@ early_param("elfcorehdr", setup_elfcorehdr);
588 588
589static int __init default_update_genapic(void) 589static int __init default_update_genapic(void)
590{ 590{
591#ifdef CONFIG_X86_SMP 591#ifdef CONFIG_SMP
592 if (!apic->wakeup_cpu) 592 if (!apic->wakeup_cpu)
593 apic->wakeup_cpu = wakeup_secondary_cpu_via_init; 593 apic->wakeup_cpu = wakeup_secondary_cpu_via_init;
594#endif 594#endif