From 60dc16e1846156403428d644e82455d100f3da66 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 28 Feb 2008 14:10:49 +0100
Subject: [PATCH] --- yaml --- r: 88679 b: refs/heads/master c:
 bdd3cee2e4b7279457139058615ced6c2b41e7de h: refs/heads/master i:   88677:
 ea3ed258cdde9af3bea07e8a5dc27701be6fa79d   88675:
 66c6a9b681ca0163dc49091165d87e5efee956a0   88671:
 ba1831589674d84bc807fc19fcbadab2c25d665c v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/ioremap.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7a4e91c6bf8f..a8c8cc3bafd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b089c12b25284a5e31ede7c98936a2b36a41e090
+refs/heads/master: bdd3cee2e4b7279457139058615ced6c2b41e7de
diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c
index 17f518839028..e5608d380176 100644
--- a/trunk/arch/x86/mm/ioremap.c
+++ b/trunk/arch/x86/mm/ioremap.c
@@ -146,8 +146,9 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
 	/*
 	 * Don't allow anybody to remap normal RAM that we're using..
 	 */
-	for (pfn = phys_addr >> PAGE_SHIFT; pfn < max_pfn_mapped &&
-	     (pfn << PAGE_SHIFT) < last_addr; pfn++) {
+	for (pfn = phys_addr >> PAGE_SHIFT;
+				(pfn << PAGE_SHIFT) < last_addr; pfn++) {
+
 		if (page_is_ram(pfn) && pfn_valid(pfn) &&
 		    !PageReserved(pfn_to_page(pfn)))
 			return NULL;