aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/setup_64.c')
-rw-r--r--arch/x86/kernel/setup_64.c4
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)
456 if (efi_enabled) 456 if (efi_enabled)
457 efi_reserve_bootmem(); 457 efi_reserve_bootmem();
458 458
459#ifdef CONFIG_X86_MPPARSE
459 /* 460 /*
460 * Find and reserve possible boot-time SMP configuration: 461 * Find and reserve possible boot-time SMP configuration:
461 */ 462 */
462 find_smp_config(); 463 find_smp_config();
464#endif
463#ifdef CONFIG_BLK_DEV_INITRD 465#ifdef CONFIG_BLK_DEV_INITRD
464 if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) { 466 if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {
465 unsigned long ramdisk_image = boot_params.hdr.ramdisk_image; 467 unsigned long ramdisk_image = boot_params.hdr.ramdisk_image;
@@ -502,11 +504,13 @@ void __init setup_arch(char **cmdline_p)
502 504
503 init_cpu_to_node(); 505 init_cpu_to_node();
504 506
507#ifdef CONFIG_X86_MPPARSE
505 /* 508 /*
506 * get boot-time SMP configuration: 509 * get boot-time SMP configuration:
507 */ 510 */
508 if (smp_found_config) 511 if (smp_found_config)
509 get_smp_config(); 512 get_smp_config();
513#endif
510 init_apic_mappings(); 514 init_apic_mappings();
511 ioapic_init_mappings(); 515 ioapic_init_mappings();
512 516