powerpc/4xx/ocm: Fix compilation error due to PAGE_KERNEL usage

This patch fixes a recent compilation regression in ocm:

  ocm.c: In function ‘ocm_init_node’:
  ocm.c:182:18: error: invalid operands to binary |
        (have ‘int’ and ‘pgprot_t’ {aka ‘struct <anonymous>’})
        _PAGE_EXEC | PAGE_KERNEL_NCG);
                   ^

  ocm.c:197:17: error: invalid operands to binary |
        (have ‘int’ and ‘pgprot_t’ {aka ‘struct <anonymous>’})
         _PAGE_EXEC | PAGE_KERNEL);
                    ^

Fixes: 56f3c1413f5c ("powerpc/mm: properly set PAGE_KERNEL flags in ioremap()")
Cc: stable@vger.kernel.org # v4.20
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/platforms/4xx/ocm.c b/arch/powerpc/platforms/4xx/ocm.c
index f2610a02844a238e391ce4a71fe27e959d9b66d8..c22b099c42f1cbb20857c53d81e848e8359ec7a6 100644 (file)
--- a/arch/powerpc/platforms/4xx/ocm.c
+++ b/arch/powerpc/platforms/4xx/ocm.c
@@ -179,7 +179,7 @@ static void __init ocm_init_node(int count, struct device_node *node)
        /* ioremap the non-cached region */
        if (ocm->nc.memtotal) {
                ocm->nc.virt = __ioremap(ocm->nc.phys, ocm->nc.memtotal,
-                                        _PAGE_EXEC | PAGE_KERNEL_NCG);
+                       _PAGE_EXEC | pgprot_val(PAGE_KERNEL_NCG));
 
                if (!ocm->nc.virt) {
                        printk(KERN_ERR
@@ -194,7 +194,7 @@ static void __init ocm_init_node(int count, struct device_node *node)
 
        if (ocm->c.memtotal) {
                ocm->c.virt = __ioremap(ocm->c.phys, ocm->c.memtotal,
-                                       _PAGE_EXEC | PAGE_KERNEL);
+                                       _PAGE_EXEC | pgprot_val(PAGE_KERNEL));
 
                if (!ocm->c.virt) {
                        printk(KERN_ERR