1 files changed, 3 insertions, 2 deletions

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 6d02a36e5e49..71bb3159031a 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -148,8 +148,9 @@ 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 < max_pfn_mapped &&
-                (pfn << PAGE_SHIFT) < last_addr; pfn++) {
+        for (pfn = phys_addr >> PAGE_SHIFT;
+                                (pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK);
+                                pfn++) {
 
                 int is_ram = page_is_ram(pfn);