From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 26 Nov 2013 11:23:04 +0000 (+0100)
Subject: Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi... 
X-Git-Tag: next-20131128~20^2~2^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=61d066977583803d333f1e7266b8ba772162dda4;p=karo-tx-linux.git

Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/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>
---

61d066977583803d333f1e7266b8ba772162dda4
diff --cc arch/x86/platform/efi/efi.c
index 92c02344a060,3fac4dee492f..f8ec4dafc74e
--- a/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;