summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-12-26 13:38:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-12-26 13:38:38 -0800
commit684019dd1f0092b4ffce4958c84aff0891deac83 (patch)
tree65977a5481527c26fe4a027badb9825b71ab9d35 /init
parent792bf4d871dea8b69be2aaabdd320d7c6ed15985 (diff)
parent1debf0958fa27b7c469dbf22754929ec59a7c0e7 (diff)
downloadblackbird-obmc-linux-684019dd1f0092b4ffce4958c84aff0891deac83.tar.gz
blackbird-obmc-linux-684019dd1f0092b4ffce4958c84aff0891deac83.zip
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI updates from Ingo Molnar: "The main changes in this cycle were: - Allocate the E820 buffer before doing the GetMemoryMap/ExitBootServices dance so we don't run out of space - Clear EFI boot services mappings when freeing the memory - Harden efivars against callers that invoke it on non-EFI boots - Reduce the number of memblock reservations resulting from extensive use of the new efi_mem_reserve_persistent() API - Other assorted fixes and cleanups" * 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/efi: Don't unmap EFI boot services code/data regions for EFI_OLD_MEMMAP and EFI_MIXED_MODE efi: Reduce the amount of memblock reservations for persistent allocations efi: Permit multiple entries in persistent memreserve data structure efi/libstub: Disable some warnings for x86{,_64} x86/efi: Move efi_<reserve/free>_boot_services() to arch/x86 x86/efi: Unmap EFI boot services code/data regions from efi_pgd x86/mm/pageattr: Introduce helper function to unmap EFI boot services efi/fdt: Simplify the get_fdt() flow efi/fdt: Indentation fix firmware/efi: Add NULL pointer checks in efivars API functions
Diffstat (limited to 'init')
-rw-r--r--init/main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/init/main.c b/init/main.c
index a45486330243..954d9b6c62c6 100644
--- a/init/main.c
+++ b/init/main.c
@@ -737,10 +737,6 @@ asmlinkage __visible void __init start_kernel(void)
arch_post_acpi_subsys_init();
sfi_init_late();
- if (efi_enabled(EFI_RUNTIME_SERVICES)) {
- efi_free_boot_services();
- }
-
/* Do the rest non-__init'ed, we're now alive */
arch_call_rest_init();
}
OpenPOWER on IntegriCloud