lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 289/913] video: fbdev: controlfb: Fix COMPILE_TEST build
    Date
    From: YueHaibing <yuehaibing@huawei.com>

    [ Upstream commit 567e44fb51b4f909ae58038a7301352eecea8426 ]

    If PPC_BOOK3S, PPC_PMAC and PPC32 is n, COMPILE_TEST build fails:

    drivers/video/fbdev/controlfb.c:70:0: error: "pgprot_cached_wthru" redefined [-Werror]
    #define pgprot_cached_wthru(prot) (prot)

    In file included from ./arch/powerpc/include/asm/pgtable.h:20:0,
    from ./include/linux/pgtable.h:6,
    from ./include/linux/mm.h:33,
    from drivers/video/fbdev/controlfb.c:37:
    ./arch/powerpc/include/asm/nohash/pgtable.h:243:0: note: this is the location of the previous definition
    #define pgprot_cached_wthru(prot) (__pgprot((pgprot_val(prot) & ~_PAGE_CACHE_CTL) | \

    Fixes: a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
    Signed-off-by: YueHaibing <yuehaibing@huawei.com>
    Signed-off-by: Helge Deller <deller@gmx.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/video/fbdev/controlfb.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c
    index 509311471d51..bd59e7b11ed5 100644
    --- a/drivers/video/fbdev/controlfb.c
    +++ b/drivers/video/fbdev/controlfb.c
    @@ -67,7 +67,9 @@
    #define out_8(addr, val) (void)(val)
    #define in_le32(addr) 0
    #define out_le32(addr, val) (void)(val)
    +#ifndef pgprot_cached_wthru
    #define pgprot_cached_wthru(prot) (prot)
    +#endif
    #else
    static void invalid_vram_cache(void __force *addr)
    {
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 22:03    [W:2.904 / U:1.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site