Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi...

Pull EFI virtual mapping changes from Matt Fleming:

  * New static EFI runtime services virtual mapping layout which is
    groundwork for kexec support on EFI. (Borislav Petkov)

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/include/asm/pgtable_types.h
Simple merge

diff --cc arch/x86/platform/efi/efi.c
index 92c02344a060f2dacc7997185d6fd6bc04ed225e,3fac4dee492fd6f3fa88ea9c1df4197665570537..f8ec4dafc74e5e94011c3f092f17f4c1b3f40109
--- 1/arch/x86/platform/efi/efi.c
--- 2/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@@ -806,14 -840,13 +840,16 @@@ void __init efi_enter_virtual_mode(void
  
        for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
                md = p;
 -              if (!(md->attribute & EFI_MEMORY_RUNTIME) &&
 -                  md->type != EFI_BOOT_SERVICES_CODE &&
 -                  md->type != EFI_BOOT_SERVICES_DATA)
 -                      continue;
 +              if (!(md->attribute & EFI_MEMORY_RUNTIME)) {
 +#ifdef CONFIG_X86_64
 +                      if (md->type != EFI_BOOT_SERVICES_CODE &&
 +                          md->type != EFI_BOOT_SERVICES_DATA)
 +#endif
 +                              continue;
 +              }
  
+               efi_map_region(md);
+ 
                size = md->num_pages << EFI_PAGE_SHIFT;
                end = md->phys_addr + size;