Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / microblaze / mm / pgtable.c

diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c
index 10b3bd0a980d7bacb7fec3941ba32320766a4ec0..4f4520e779a5bf06ccfc69c7b3671961c1967dff 100644 (file)
--- a/arch/microblaze/mm/pgtable.c
+++ b/arch/microblaze/mm/pgtable.c
@@ -69,10 +69,11 @@ static void __iomem *__ioremap(phys_addr_t addr, unsigned long size,
         *
         * However, allow remap of rootfs: TBD
         */
+
        if (mem_init_done &&
                p >= memory_start && p < virt_to_phys(high_memory) &&
-               !(p >= virt_to_phys((unsigned long)&__bss_stop) &&
-               p < virt_to_phys((unsigned long)__bss_stop))) {
+               !(p >= __virt_to_phys((phys_addr_t)__bss_stop) &&
+               p < __virt_to_phys((phys_addr_t)__bss_stop))) {
                pr_warn("__ioremap(): phys addr "PTE_FMT" is RAM lr %pf\n",
                        (unsigned long)p, __builtin_return_address(0));
                return NULL;