---

yaml --- r: 88679 b: refs/heads/master c: bdd3cee h: refs/heads/master i: 88677: ea3ed25 88675: 66c6a9b 88671: ba18315 v: v3
git-mirror · Apr 17, 2008 · 60dc16e · 60dc16e
1 parent f08653e
commit 60dc16e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;