diff options
| -rw-r--r-- | arch/x86/kernel/setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 8af2e8d0c0a1..145810b0edf6 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -906,9 +906,6 @@ void __init setup_arch(char **cmdline_p) | |||
| 906 | set_bit(EFI_BOOT, &efi.flags); | 906 | set_bit(EFI_BOOT, &efi.flags); |
| 907 | set_bit(EFI_64BIT, &efi.flags); | 907 | set_bit(EFI_64BIT, &efi.flags); |
| 908 | } | 908 | } |
| 909 | |||
| 910 | if (efi_enabled(EFI_BOOT)) | ||
| 911 | efi_memblock_x86_reserve_range(); | ||
| 912 | #endif | 909 | #endif |
| 913 | 910 | ||
| 914 | x86_init.oem.arch_setup(); | 911 | x86_init.oem.arch_setup(); |
| @@ -962,6 +959,8 @@ void __init setup_arch(char **cmdline_p) | |||
| 962 | 959 | ||
| 963 | parse_early_param(); | 960 | parse_early_param(); |
| 964 | 961 | ||
| 962 | if (efi_enabled(EFI_BOOT)) | ||
| 963 | efi_memblock_x86_reserve_range(); | ||
| 965 | #ifdef CONFIG_MEMORY_HOTPLUG | 964 | #ifdef CONFIG_MEMORY_HOTPLUG |
| 966 | /* | 965 | /* |
| 967 | * Memory used by the kernel cannot be hot-removed because Linux | 966 | * Memory used by the kernel cannot be hot-removed because Linux |
