[PATCH] ARM: riscpc: Unbreak the build

[Russell King (Oracle)]

On Tue, Aug 30, 2022 at 01:55:50PM -0700, Bart Van Assche wrote:
> On 8/30/22 12:58, Russell King (Oracle) wrote:
> > On Tue, Aug 30, 2022 at 12:55:17PM -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
> > > Signed-off-by: Bart Van Assche <bvanassche at acm.org>
> > 
> > Please work out which commit caused this breakage, thanks.
> 
> Hi Russell,
> 
> A bisect led to the following:
> 
> Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")
> 
> Please let me know if you want me to repost this patch with the Fixes tag
> included.

That is indeed the cause, and I'd say that the patch to fix it is
incorrect.

misc-ep93xx.h brings in EP93xx specific raw IO accessors into the
decompressor, but we've already had (and correctly had) linux/io.h
included.

The problem is misc-ep93xx.h. Why is it defining these accessors?
That's a question for Arnd.

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