Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm64 / mm / ioremap.c

diff --git a/arch/arm64/mm/ioremap.c b/arch/arm64/mm/ioremap.c
index b5e83c4..b7c81da 100644 (file)
--- a/arch/arm64/mm/ioremap.c
+++ b/arch/arm64/mm/ioremap.c
@@ -43,7 +43,7 @@ static void __iomem *__ioremap_caller(phys_addr_t phys_addr, size_t size,
        /*
         * Don't allow RAM to be mapped.
         */
-       if (WARN_ON(pfn_valid(__phys_to_pfn(phys_addr))))
+       if (WARN_ON(pfn_is_map_memory(__phys_to_pfn(phys_addr))))
                return NULL;
 
        area = get_vm_area_caller(size, VM_IOREMAP, caller);
@@ -84,7 +84,7 @@ EXPORT_SYMBOL(iounmap);
 void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size)
 {
        /* For normal memory we already have a cacheable mapping. */
-       if (pfn_valid(__phys_to_pfn(phys_addr)))
+       if (pfn_is_map_memory(__phys_to_pfn(phys_addr)))
                return (void __iomem *)__phys_to_virt(phys_addr);
 
        return __ioremap_caller(phys_addr, size, __pgprot(PROT_NORMAL),