Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (9065e063) · Commits · 戴 / test

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

arch/x86/platform/efi/quirks.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/*

Admin message