| Message ID | 20220908203408.2915537-1-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: riscpc: Unbreak the build | expand |
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@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> > --- > 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.
On 9/8/22 13:38, Russell King (Oracle) wrote: > That'll do. Please put it in the patch system, and I'll get to it maybe > next week sometime. Thanks. Hi Russell, Can you please clarify what "put it in the patch system" means? I'm familiar with the email based workflow but not with any other workflow for submitting kernel patches. Thanks, Bart.
On Thu, Sep 8, 2022, at 10:45 PM, Bart Van Assche wrote: > On 9/8/22 13:38, Russell King (Oracle) wrote: >> That'll do. Please put it in the patch system, and I'll get to it maybe >> next week sometime. Thanks. > > Hi Russell, > > Can you please clarify what "put it in the patch system" means? I'm familiar > with the email based workflow but not with any other workflow for submitting > kernel patches. See https://www.arm.linux.org.uk/developer/patches/info.php for the process. You can use something like git send-email --add-header=\"KernelVersion: $(git describe --abbrev=0)\" --to="patches@arm.linux.org.uk" to add a patch there, and check the status in https://www.arm.linux.org.uk/developer/patches/section.php?section=0 Arnd
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);
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> --- arch/arm/boot/compressed/misc.c | 2 ++ 1 file changed, 2 insertions(+)