From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 20 Sep 2016 14:58:59 +0000 (+0200)
Subject: Merge branch 'efi/urgent' into efi/core, to pick up fixes
X-Git-Tag: v4.9-rc1~166^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=41a66072c32978ff3914fd6be88f7592ef64bef7;p=linux-2.6-block.git

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

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

41a66072c32978ff3914fd6be88f7592ef64bef7
diff --cc arch/x86/platform/efi/efi_64.c
index d65cdadaa6b6,8dd3784eb075..58b0f801f66f
--- a/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");