diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-18 10:52:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-18 10:52:26 -0800 |
| commit | 743a4863fddc4fdd591e1cbf4157e981a71b0f09 (patch) | |
| tree | 13674728a7d2b80acf8aa6f27d085e58be01db2e /arch | |
| parent | cfaa9f029f8141e9ee8d621a126d9dd4cc89aa63 (diff) | |
| parent | 63eb322d89c8505af9b4a3d703e85e42281ebaa0 (diff) | |
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar:
"Misc fixes: two warning splat fixes, a leak fix and persistent memory
allocation fixes for ARM"
* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi: Permit calling efi_mem_reserve_persistent() from atomic context
efi/arm: Defer persistent reservations until after paging_init()
efi/arm/libstub: Pack FDT after populating it
efi/arm: Revert deferred unmap of early memmap mapping
efi: Fix debugobjects warning on 'efi_rts_work'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 953e316521fc..f4fc1e0544b7 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -313,6 +313,7 @@ void __init setup_arch(char **cmdline_p) arm64_memblock_init(); paging_init(); + efi_apply_persistent_mem_reservations(); acpi_table_upgrade(); |