Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / sysdev / fsl_85xx_cache_sram.c

diff --git a/arch/powerpc/sysdev/fsl_85xx_cache_sram.c b/arch/powerpc/sysdev/fsl_85xx_cache_sram.c
index 54fb1922fe30c8a2a6e84161e335f640b95c6c57..116415899176aa4d83fbcd4ca56a4ac5728f7719 100644 (file)
--- a/arch/powerpc/sysdev/fsl_85xx_cache_sram.c
+++ b/arch/powerpc/sysdev/fsl_85xx_cache_sram.c
@@ -106,10 +106,10 @@ int __init instantiate_cache_sram(struct platform_device *dev,
                goto out_free;
        }
 
-       cache_sram->base_virt = ioremap_flags(cache_sram->base_phys,
+       cache_sram->base_virt = ioremap_prot(cache_sram->base_phys,
                                cache_sram->size, _PAGE_COHERENT | PAGE_KERNEL);
        if (!cache_sram->base_virt) {
-               dev_err(&dev->dev, "%s: ioremap_flags failed\n",
+               dev_err(&dev->dev, "%s: ioremap_prot failed\n",
                                dev->dev.of_node->full_name);
                ret = -ENOMEM;
                goto out_release;