Merge branch 'efi/urgent' into efi/core, to pick up fixes

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/platform/efi/efi_64.c
index d65cdadaa6b61401816fc9af66db0f61524e2445,8dd3784eb0752ea6ff4cc0d21f249ca084a323f6..58b0f801f66f97212fb9904c77d88ad44c2703de
--- 1/arch/x86/platform/efi/efi_64.c
--- 2/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@@ -244,9 -245,28 +244,9 @@@ int __init efi_setup_page_tables(unsign
         * text and allocate a new stack because we can't rely on the
         * stack pointer being < 4GB.
         */
-       if (!IS_ENABLED(CONFIG_EFI_MIXED))
+       if (!IS_ENABLED(CONFIG_EFI_MIXED) || efi_is_native())
                return 0;
  
 -      /*
 -       * Map all of RAM so that we can access arguments in the 1:1
 -       * mapping when making EFI runtime calls.
 -       */
 -      for_each_efi_memory_desc(md) {
 -              if (md->type != EFI_CONVENTIONAL_MEMORY &&
 -                  md->type != EFI_LOADER_DATA &&
 -                  md->type != EFI_LOADER_CODE)
 -                      continue;
 -
 -              pfn = md->phys_addr >> PAGE_SHIFT;
 -              npages = md->num_pages;
 -
 -              if (kernel_map_pages_in_pgd(pgd, pfn, md->phys_addr, npages, _PAGE_RW)) {
 -                      pr_err("Failed to map 1:1 memory\n");
 -                      return 1;
 -              }
 -      }
 -
        page = alloc_page(GFP_KERNEL|__GFP_DMA32);
        if (!page)
                panic("Unable to allocate EFI runtime stack < 4GB\n");