x86, acpi, crash, kdump: do reserve_crashkernel() after SRAT is parsed.

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f0de629..cb233bc 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -993,6 +993,7 @@ void __init setup_arch(char **cmdline_p)
                efi_init();
 
        dmi_scan_machine();
+       dmi_memdev_walk();
        dmi_set_dump_stack_arch_desc();
 
        /*
@@ -1120,8 +1121,6 @@ void __init setup_arch(char **cmdline_p)
        acpi_initrd_override((void *)initrd_start, initrd_end - initrd_start);
 #endif
 
-       reserve_crashkernel();
-
        vsmp_init();
 
        io_delay_init();
@@ -1134,6 +1133,13 @@ void __init setup_arch(char **cmdline_p)
        early_acpi_boot_init();
 
        initmem_init();
+
+       /*
+        * Reserve memory for crash kernel after SRAT is parsed so that it
+        * won't consume hotpluggable memory.
+        */
+       reserve_crashkernel();
+
        memblock_find_dma_reserve();
 
 #ifdef CONFIG_KVM_GUEST