x86: allow MPPARSE to be deselected in SMP configs

1 files changed, 4 insertions, 0 deletions

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();