Merge branch 'x86/urgent' into x86/pat

[deliverable/linux.git] / arch / x86 / mm / ioremap.c

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index aeaea8c5b2f40bd969a709ff068efe95928f08f7..2a76eba9da216eb1eeb5272be4d799d59b8cd259 100644 (file)
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -233,7 +233,8 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
        }
 
        if (prot_val != new_prot_val) {
-               if (!is_new_memtype_allowed(prot_val, new_prot_val)) {
+               if (!is_new_memtype_allowed(phys_addr, size,
+                                           prot_val, new_prot_val)) {
                        printk(KERN_ERR
                "ioremap error for 0x%llx-0x%llx, requested 0x%lx, got 0x%lx\n",
                                (unsigned long long)phys_addr,