diff options
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index cb42109a55b4..5d7ba1a449bd 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -969,15 +969,11 @@ void __init setup_arch(char **cmdline_p) | |||
969 | #endif | 969 | #endif |
970 | 970 | ||
971 | initmem_init(0, max_pfn, acpi, k8); | 971 | initmem_init(0, max_pfn, acpi, k8); |
972 | #ifndef CONFIG_NO_BOOTMEM | ||
973 | early_res_to_bootmem(0, max_low_pfn<<PAGE_SHIFT); | ||
974 | #endif | ||
972 | 975 | ||
973 | #ifdef CONFIG_X86_64 | ||
974 | /* | ||
975 | * dma32_reserve_bootmem() allocates bootmem which may conflict | ||
976 | * with the crashkernel command line, so do that after | ||
977 | * reserve_crashkernel() | ||
978 | */ | ||
979 | dma32_reserve_bootmem(); | 976 | dma32_reserve_bootmem(); |
980 | #endif | ||
981 | 977 | ||
982 | reserve_ibft_region(); | 978 | reserve_ibft_region(); |
983 | 979 | ||