lkml.org 
[lkml]   [2019]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 55/65] powerpc/4xx/ocm: Fix compilation error due to PAGE_KERNEL usage
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christian Lamparter <chunkeey@gmail.com>

    commit d0757237d7b18b1ce74293be7c077d86f7a732e8 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/powerpc/platforms/4xx/ocm.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- 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 cou
    /* 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 cou

    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

    \
     
     \ /
      Last update: 2019-01-11 15:44    [W:4.029 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site