X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fx86%2Fmm%2Fioremap.c;h=f4c95aec5acb211e182970b6d13f9a53f2fda557;hb=156fbc3fbe4ab640297b1ae2092821363840aeb6;hp=7fb6eff644b3abb8dc407de03b40bf04c458e0c6;hpb=d8a9e6a51ec58486f850e3606e3fcb86b5b7da41;p=linux-2.6-omap-h63xx.git

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 7fb6eff644b..f4c95aec5ac 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -50,6 +50,13 @@ int page_is_ram(unsigned long pagenr)
 	if (pagenr == 0)
 		return 0;
 
+	/*
+	 * Second special case: Some BIOSen report the PC BIOS
+	 * area (640->1Mb) as ram even though it is not.
+	 */
+	if (pagenr >= (BIOS_BEGIN >> PAGE_SHIFT) &&
+		    pagenr < (BIOS_END >> PAGE_SHIFT))
+		return 0;
 
 	for (i = 0; i < e820.nr_map; i++) {
 		/*
@@ -60,14 +67,6 @@ int page_is_ram(unsigned long pagenr)
 		addr = (e820.map[i].addr + PAGE_SIZE-1) >> PAGE_SHIFT;
 		end = (e820.map[i].addr + e820.map[i].size) >> PAGE_SHIFT;
 
-		/*
-		 * Sanity check: Some BIOSen report areas as RAM that
-		 * are not. Notably the 640->1Mb area, which is the
-		 * PCI BIOS area.
-		 */
-		if (addr >= (BIOS_BEGIN >> PAGE_SHIFT) &&
-		    end < (BIOS_END >> PAGE_SHIFT))
-			continue;
 
 		if ((pagenr >= addr) && (pagenr < end))
 			return 1;