x86: allow MPPARSE to be deselected in SMP configs

3 files changed, 6 insertions, 2 deletions

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index ac1e31ba4795..d5b364b43a02 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -127,7 +127,7 @@ config 4KSTACKS
 
 config X86_FIND_SMP_CONFIG
         def_bool y
-        depends on X86_LOCAL_APIC || X86_VOYAGER
+        depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS
         depends on X86_32
 
 config X86_MPPARSE
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index e1173aecf69a..c04e8c91daf7 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -814,7 +814,7 @@ void __init setup_arch(char **cmdline_p)
                         "CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n");
 #endif
 #endif
-#ifdef CONFIG_X86_LOCAL_APIC
+#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
         if (smp_found_config)
                 get_smp_config();
 #endif
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 975a5da46e49..89e6cca5d693 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -456,10 +456,12 @@ void __init setup_arch(char **cmdline_p)
         if (efi_enabled)
                 efi_reserve_bootmem();
 
+#ifdef CONFIG_X86_MPPARSE
        /*
         * Find and reserve possible boot-time SMP configuration:
         */
         find_smp_config();
+#endif
 #ifdef CONFIG_BLK_DEV_INITRD
         if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {
                 unsigned long ramdisk_image = boot_params.hdr.ramdisk_image;
@@ -502,11 +504,13 @@ void __init setup_arch(char **cmdline_p)
 
         init_cpu_to_node();
 
+#ifdef CONFIG_X86_MPPARSE
         /*
          * get boot-time SMP configuration:
          */
         if (smp_found_config)
                 get_smp_config();
+#endif
         init_apic_mappings();
         ioapic_init_mappings();