diff --git a/[refs] b/[refs]
index 3db875f84ef8..b71577a98a3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c6357da1185d286adaa4452d829ac9b27c4d12f
+refs/heads/master: d8a9e6a51ec58486f850e3606e3fcb86b5b7da41
diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c
index 9f42d7e9c158..7fb6eff644b3 100644
--- a/trunk/arch/x86/mm/ioremap.c
+++ b/trunk/arch/x86/mm/ioremap.c
@@ -42,6 +42,15 @@ int page_is_ram(unsigned long pagenr)
 	unsigned long addr, end;
 	int i;
 
+	/*
+	 * A special case is the first 4Kb of memory;
+	 * This is a BIOS owned area, not kernel ram, but generally
+	 * not listed as such in the E820 table.
+	 */
+	if (pagenr == 0)
+		return 0;
+
+
 	for (i = 0; i < e820.nr_map; i++) {
 		/*
 		 * Not usable memory: