lkml.org 
[lkml]   [2022]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 187/717] ARM: 9243/1: riscpc: Unbreak the build
    Date
    From: Bart Van Assche <bvanassche@acm.org>

    [ Upstream commit 32844a8eecaa4a3e65841c53e43e04a9087d1ef6 ]

    This patch fixes the following build error:

    In file included from ./include/linux/io.h:13,
    from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
    from arch/arm/boot/compressed/misc.c:31:
    ./arch/arm/include/asm/io.h:85:22: error: conflicting types for ‘__raw_writeb’
    85 | #define __raw_writeb __raw_writeb
    | ^~~~~~~~~~~~
    ./arch/arm/include/asm/io.h:86:20: note: in expansion of macro ‘__raw_writeb’
    86 | static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
    | ^~~~~~~~~~~~
    In file included from arch/arm/boot/compressed/misc.c:26:
    arch/arm/boot/compressed/misc-ep93xx.h:13:20: note: previous definition of ‘__raw_writeb’ was here
    13 | static inline void __raw_writeb(unsigned char value, unsigned int ptr)
    | ^~~~~~~~~~~~

    To: Russell King <linux@armlinux.org.uk>

    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: linux-arm-kernel@lists.infradead.org
    Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")
    Signed-off-by: Bart Van Assche <bvanassche@acm.org>
    Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/compressed/misc.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
    index cb2e069dc73f..abfed1aa2baa 100644
    --- a/arch/arm/boot/compressed/misc.c
    +++ b/arch/arm/boot/compressed/misc.c
    @@ -23,7 +23,9 @@ unsigned int __machine_arch_type;
    #include <linux/types.h>
    #include <linux/linkage.h>
    #include "misc.h"
    +#ifdef CONFIG_ARCH_EP93XX
    #include "misc-ep93xx.h"
    +#endif

    static void putstr(const char *ptr);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-22 09:48    [W:4.024 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site