Commit d0757237 authored Dec 22, 2018 by Christian Lamparter Committed by Michael Ellerman Dec 30, 2018

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: 56f3c141 ("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>

parent 039daac5

arch/powerpc/platforms/4xx/ocm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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