---

yaml --- r: 100038 b: refs/heads/master c: c22d4c1 h: refs/heads/master v: v3
git-mirror · Jul 9, 2008 · 11d3cc5 · 11d3cc5
1 parent 1def7b7
commit 11d3cc5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;