Patch "ARM: 9243/1: riscpc: Unbreak the build" has been added to the 6.0-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    ARM: 9243/1: riscpc: Unbreak the build

to the 6.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-9243-1-riscpc-unbreak-the-build.patch
and it can be found in the queue-6.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit f8e79cbfa9608d069a9d8332d4f833ee254ab89c
Author: Bart Van Assche <bvanassche@xxxxxxx>
Date:   Mon Sep 12 23:13:53 2022 +0100

    ARM: 9243/1: riscpc: Unbreak the build
    
    [ 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@xxxxxxxxxxxxxxx>
    
    Cc: Arnd Bergmann <arnd@xxxxxxxx>
    Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
    Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support")
    Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
    Signed-off-by: Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

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);