path: root/init
diff options
authorDave Young <>2017-01-31 13:21:40 +0000
committerIngo Molnar <>2017-02-01 08:45:46 +0100
commit7b0a911478c74ca02581d496f732c10e811e894f (patch)
treee23d10876a20bbb53fedb68435b5ace9ad3622d9 /init
parentc4c39c70c5fef43655019236bec8ba5e7273b868 (diff)
efi/x86: Move the EFI BGRT init code to early init code
Before invoking the arch specific handler, efi_mem_reserve() reserves the given memory region through memblock. efi_bgrt_init() will call efi_mem_reserve() after mm_init(), at which time memblock is dead and should not be used anymore. The EFI BGRT code depends on ACPI initialization to get the BGRT ACPI table, so move parsing of the BGRT table to ACPI early boot code to ensure that efi_mem_reserve() in EFI BGRT code still use memblock safely. Tested-by: Bhupesh Sharma <> Signed-off-by: Dave Young <> Signed-off-by: Ard Biesheuvel <> Cc: Len Brown <> Cc: Linus Torvalds <> Cc: Matt Fleming <> Cc: Peter Zijlstra <> Cc: Rafael J. Wysocki <> Cc: Thomas Gleixner <> Cc: Cc: Link: Signed-off-by: Ingo Molnar <>
Diffstat (limited to 'init')
1 files changed, 0 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index b0c9d6f..9648d70 100644
--- a/init/main.c
+++ b/init/main.c
@@ -663,7 +663,6 @@ asmlinkage __visible void __init start_kernel(void)
if (efi_enabled(EFI_RUNTIME_SERVICES)) {
- efi_late_init();