[PATCH] ARM: riscpc: Unbreak the build

[Russell King (Oracle)]

On Thu, Sep 08, 2022 at 01:34:08PM -0700, Bart Van Assche wrote:
> 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 at armlinux.org.uk>
> Cc: Arnd Bergmann <arnd at arndb.de>
> Cc: linux-arm-kernel at lists.infradead.org
> Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")
> Signed-off-by: Bart Van Assche <bvanassche at acm.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);
>  

That'll do. Please put it in the patch system, and I'll get to it maybe
next week sometime. Thanks.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!