]> git.itanic.dy.fi Git - linux-stable/commit
powerpc/4xx/ocm: Fix compilation error due to PAGE_KERNEL usage
authorChristian Lamparter <chunkeey@gmail.com>
Sat, 22 Dec 2018 14:35:38 +0000 (15:35 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Sun, 30 Dec 2018 03:00:47 +0000 (14:00 +1100)
commitd0757237d7b18b1ce74293be7c077d86f7a732e8
tree0d420bfc10cbcf09e20bb3601cc6f10bdeb31e8f
parent039daac5526932ec731e4499613018d263af8b3e
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>
arch/powerpc/platforms/4xx/ocm.c