From c78ade3bf0bc731e916a322affd907281542ab14 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 29 Apr 2008 12:04:51 +0200
Subject: [PATCH] --- yaml --- r: 95622 b: refs/heads/master c:
 2544a873ab2a1ee9196bb2f4b12c3afd44ec8a06 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 75f212a12aa9..f9ef24c3264d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4c863f497e640e049083e1b3a1f3723cb766da9
+refs/heads/master: 2544a873ab2a1ee9196bb2f4b12c3afd44ec8a06
diff --git a/trunk/arch/x86/mm/ioremap.c b/trunk/arch/x86/mm/ioremap.c
index 804de18abcc2..0be9f9c59aa6 100644
--- a/trunk/arch/x86/mm/ioremap.c
+++ b/trunk/arch/x86/mm/ioremap.c
@@ -148,8 +148,8 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
 	/*
 	 * Don't allow anybody to remap normal RAM that we're using..
 	 */
-	for (pfn = phys_addr >> PAGE_SHIFT;
-				(pfn << PAGE_SHIFT) < last_addr; pfn++) {
+	for (pfn = phys_addr >> PAGE_SHIFT; pfn < max_pfn_mapped &&
+		(pfn << PAGE_SHIFT) < last_addr; pfn++) {
 
 		int is_ram = page_is_ram(pfn);