From 11d3cc500e486e1f89bae6807209f93fb7d86b34 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Wed, 9 Jul 2008 03:01:14 -0700
Subject: [PATCH] --- yaml --- r: 100038 b: refs/heads/master c:
 c22d4c1885130db9c07f6441ab461208a1ba16b2 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kernel/e820.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2cf2ecbf6f9e..db43705d4c8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 183fe065652dbd64953afa9f389327e23e97967f
+refs/heads/master: c22d4c1885130db9c07f6441ab461208a1ba16b2
diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/arch/x86/kernel/e820.c
index 2e08619a9c5c..292ebc7fe4d0 100644
--- a/trunk/arch/x86/kernel/e820.c
+++ b/trunk/arch/x86/kernel/e820.c
@@ -1066,6 +1066,11 @@ unsigned long __init e820_end(void)
 		struct e820entry *ei = &e820.map[i];
 		unsigned long end_pfn;
 
+#ifdef CONFIG_X86_32
+		if (ei->type != E820_RAM)
+			continue;
+#endif
+
 		end_pfn = (ei->addr + ei->size) >> PAGE_SHIFT;
 		if (end_pfn > last_pfn)
 			last_pfn = end_pfn;