[PATCH] ARM: riscpc: Unbreak the build

Bart Van Assche bvanassche at acm.org
Tue Aug 30 12:55:17 PDT 2022


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>
---
 arch/arm/mach-rpc/include/mach/uncompress.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h
index 1fbe7eb956fd..97edaf6a1f07 100644
--- a/arch/arm/mach-rpc/include/mach/uncompress.h
+++ b/arch/arm/mach-rpc/include/mach/uncompress.h
@@ -6,7 +6,6 @@
  */
 #define VIDMEM ((char *)SCREEN_START)
  
-#include <linux/io.h>
 #include <mach/hardware.h>
 #include <asm/setup.h>
 #include <asm/page.h>



More information about the linux-arm-kernel mailing list