diff options
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 918d489fa53d..cb233bc9dee3 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -1121,8 +1121,6 @@ void __init setup_arch(char **cmdline_p) | |||
1121 | acpi_initrd_override((void *)initrd_start, initrd_end - initrd_start); | 1121 | acpi_initrd_override((void *)initrd_start, initrd_end - initrd_start); |
1122 | #endif | 1122 | #endif |
1123 | 1123 | ||
1124 | reserve_crashkernel(); | ||
1125 | |||
1126 | vsmp_init(); | 1124 | vsmp_init(); |
1127 | 1125 | ||
1128 | io_delay_init(); | 1126 | io_delay_init(); |
@@ -1135,6 +1133,13 @@ void __init setup_arch(char **cmdline_p) | |||
1135 | early_acpi_boot_init(); | 1133 | early_acpi_boot_init(); |
1136 | 1134 | ||
1137 | initmem_init(); | 1135 | initmem_init(); |
1136 | |||
1137 | /* | ||
1138 | * Reserve memory for crash kernel after SRAT is parsed so that it | ||
1139 | * won't consume hotpluggable memory. | ||
1140 | */ | ||
1141 | reserve_crashkernel(); | ||
1142 | |||
1138 | memblock_find_dma_reserve(); | 1143 | memblock_find_dma_reserve(); |
1139 | 1144 | ||
1140 | #ifdef CONFIG_KVM_GUEST | 1145 | #ifdef CONFIG_KVM_GUEST |