x86: make x86_find_smp_config depends on 64 bit too

Signed-off-by: Yinghai Lu <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 25ff7548d3dad1253d3295a5140719d07c54a4df..9441e46cb49b7a34e0a6a35bbb3756a01710eb89 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -233,7 +233,6 @@ config SMP
 config X86_FIND_SMP_CONFIG
        def_bool y
        depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS
-       depends on X86_32
 
 if ACPI
 config X86_MPPARSE

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 08efab538a24824690fba5d23d896b88875f8501..7690547ac2855aa39bd5370852c5a1038e6c80dc 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -714,8 +714,7 @@ void __init setup_arch(char **cmdline_p)
         */
        acpi_reserve_bootmem();
 #endif
-#if defined(CONFIG_X86_FIND_SMP_CONFIG) && defined(CONFIG_X86_32) || \
-    defined(CONFIG_X86_MPPARSE) && defined(CONFIG_X86_64)
+#ifdef CONFIG_X86_FIND_SMP_CONFIG
        /*
         * Find and reserve possible boot-time SMP configuration:
         */