diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-17 11:17:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-17 11:17:03 -0800 |
| commit | 9065e0636036e4f8a6f65f9c34ed384e4b776273 (patch) | |
| tree | 6c994000409a3221910f90f15e9dcb186f5b01a6 /arch | |
| parent | 2abf193275768ac89f5d93eec7bcacb238168151 (diff) | |
| parent | af164898482817a1d487964b68f3c21bae7a1beb (diff) | |
| download | linux-9065e0636036e4f8a6f65f9c34ed384e4b776273.tar.bz2 | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Ingo Molnar:
"Fix kexec booting with certain EFI memory map layouts"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/efi: Update e820 with reserved EFI boot services data to fix kexec breakage
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/platform/efi/quirks.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 7675cf754d90..f8f0220b6a66 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -260,10 +260,6 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) return; } - /* No need to reserve regions that will never be freed. */ - if (md.attribute & EFI_MEMORY_RUNTIME) - return; - size += addr % EFI_PAGE_SIZE; size = round_up(size, EFI_PAGE_SIZE); addr = round_down(addr, EFI_PAGE_SIZE); @@ -293,6 +289,8 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) early_memunmap(new, new_size); efi_memmap_install(new_phys, num_entries); + e820__range_update(addr, size, E820_TYPE_RAM, E820_TYPE_RESERVED); + e820__update_table(e820_table); } /* |