Merge tag 'm68k-for-v4.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / 4xx / ocm.c

diff --git a/arch/powerpc/platforms/4xx/ocm.c b/arch/powerpc/platforms/4xx/ocm.c
index 69d9f60d9fe5357a5fd3c18b28833cb5198e1211..f5bbd4563342bb38cece3176132301e6d28484dd 100644 (file)
--- a/arch/powerpc/platforms/4xx/ocm.c
+++ b/arch/powerpc/platforms/4xx/ocm.c
@@ -113,7 +113,6 @@ static void __init ocm_init_node(int count, struct device_node *node)
        int len;
 
        struct resource rsrc;
-       int ioflags;
 
        ocm = ocm_get_node(count);
 
@@ -179,9 +178,8 @@ static void __init ocm_init_node(int count, struct device_node *node)
 
        /* ioremap the non-cached region */
        if (ocm->nc.memtotal) {
-               ioflags = _PAGE_NO_CACHE | _PAGE_GUARDED | _PAGE_EXEC;
                ocm->nc.virt = __ioremap(ocm->nc.phys, ocm->nc.memtotal,
-                                         ioflags);
+                                        _PAGE_EXEC | PAGE_KERNEL_NCG);
 
                if (!ocm->nc.virt) {
                        printk(KERN_ERR
@@ -195,9 +193,8 @@ static void __init ocm_init_node(int count, struct device_node *node)
        /* ioremap the cached region */
 
        if (ocm->c.memtotal) {
-               ioflags = _PAGE_EXEC;
                ocm->c.virt = __ioremap(ocm->c.phys, ocm->c.memtotal,
-                                        ioflags);
+                                       _PAGE_EXEC | PAGE_KERNEL);
 
                if (!ocm->c.virt) {
                        printk(KERN_ERR