|
@@ -906,9 +906,6 @@ void __init setup_arch(char **cmdline_p)
|
|
|
set_bit(EFI_BOOT, &efi.flags);
|
|
|
set_bit(EFI_64BIT, &efi.flags);
|
|
|
}
|
|
|
-
|
|
|
- if (efi_enabled(EFI_BOOT))
|
|
|
- efi_memblock_x86_reserve_range();
|
|
|
#endif
|
|
|
|
|
|
x86_init.oem.arch_setup();
|
|
@@ -962,6 +959,8 @@ void __init setup_arch(char **cmdline_p)
|
|
|
|
|
|
parse_early_param();
|
|
|
|
|
|
+ if (efi_enabled(EFI_BOOT))
|
|
|
+ efi_memblock_x86_reserve_range();
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG
|
|
|
/*
|
|
|
* Memory used by the kernel cannot be hot-removed because Linux
|