Commit 17787542 authored Jun 05, 2014 by H. Peter Anvin

Merge tag 'efi-urgent' into x86/urgent



 * Fix earlyprintk=efi,keep support by switching to an ioremap() mapping
   of the framebuffer when early_ioremap() is no longer available and
   dropping __init from functions that may be invoked after
   free_initmem() - Dave Young

 * We shouldn't be exporting the EFI runtime map in sysfs if not using
   the new 1:1 EFI mapping code since in that case the mappings are not
   static across a kexec reboot - Dave Young

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

parents 3e1a878b a3530e8f

arch/x86/platform/efi/efi.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -919,6 +919,9 @@ static void __init save_runtime_map(void)
		void tmp, p, *q = NULL;
		int count = 0;

		if (efi_enabled(EFI_OLD_MEMMAP))
		return;

		for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
		md = p;