x86 fix
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
# HEAD: af164898482817a1d487964b68f3c21bae7a1beb x86/efi: Update e820 with reserved EFI boot services data to fix kexec breakage
Fix kexec booting with certain EFI memory map layouts.
Thanks,
Ingo
------------------>
Dave Young (1):
x86/efi: Update e820 with reserved EFI boot services data to fix kexec breakage
arch/x86/platform/efi/quirks.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/platform/efi/quirks.c +2 -4
@@ -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); }/*
The pull request you sent on Tue, 17 Dec 2019 12:58:35 +0100:
The pull request you sent on Tue, 17 Dec 2019 12:58:35 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitx86-urgent-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9065e0636036e4f8a6f65f9c34ed384e4b776273
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker