[linux-yocto] [PATCH 2/2] efi: Add patch to fix 32bit EFI service mapping (rhbz 726701)

[Darren Hart]

From: Tom Zanussi <tom.zanussi at intel.com>

>From fedora kernel:

 commit 6f3e186bc7721c5b24ad90d4a751cccfccd445e6
 Author: Josh Boyer <jwboyer at redhat.com>
 Date:   Fri Aug 5 08:47:23 2011 -0400

    Add patch to fix 32bit EFI service mapping (rhbz 726701)

Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 arch/x86/platform/efi/efi.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 92660eda..08d0e82 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -819,10 +819,13 @@ 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;
+		}
 
 		size = md->num_pages << EFI_PAGE_SHIFT;
 		end = md->phys_addr + size;
-- 
1.7.5.4