revert: "x86: ioremap(), extend check to all RAM pages"

[safe/jmp/linux-2.6] / arch / x86 / mm / ioremap.c

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 804de18..0be9f9c 100644 (file)
--- a/arch/x86/mm/ioremap.c
+++ b/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);