From: H. Peter Anvin <hpa@linux.intel.com>
Date: Thu, 5 Jun 2014 20:09:44 +0000 (-0700)
Subject: Merge tag 'efi-urgent' into x86/urgent
X-Git-Tag: v4.14-rc1~7443^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=177875423eb01179738f6badcbb9eef4be789a0e;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

177875423eb01179738f6badcbb9eef4be789a0e