From: Edgar Hucek <hostmaster@ed-soft.at>

Fix EFI boot on 32 bit machines with PCI Express slots.  Efi machines does
not have an e820 memory map.  Without this patch a native EFI boot, on
Intel Macs, is impossible.

Signed-off-by: Edgar Hucek <hostmaster@ed-soft.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/setup.c |    4 ++++
 1 file changed, 4 insertions(+)

diff -puN arch/i386/kernel/setup.c~fix-boot-on-efi-32-bit-machines arch/i386/kernel/setup.c
--- a/arch/i386/kernel/setup.c~fix-boot-on-efi-32-bit-machines
+++ a/arch/i386/kernel/setup.c
@@ -866,6 +866,10 @@ e820_all_mapped(unsigned long s, unsigne
 	u64 start = s;
 	u64 end = e;
 	int i;
+
+	if (efi_enabled)	/* EFI machines don't have e820 maps */
+		return 1;
+
 	for (i = 0; i < e820.nr_map; i++) {
 		struct e820entry *ei = &e820.map[i];
 		if (type && ei->type != type)
_