6.1-stable patches

added patches:
	parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch

diff --git a/queue-6.1/parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch b/queue-6.1/parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch
new file mode 100644 (file)
index 0000000..5e5bca0
--- /dev/null
+++ b/queue-6.1/parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch
@@ -0,0 +1,47 @@
+From b5b2a02bcaac7c287694aa0db4837a07bf178626 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <benh@debian.org>
+Date: Thu, 15 Jun 2023 00:00:02 +0200
+Subject: parisc: Delete redundant register definitions in <asm/assembly.h>
+
+From: Ben Hutchings <benh@debian.org>
+
+commit b5b2a02bcaac7c287694aa0db4837a07bf178626 upstream.
+
+We define sp and ipsw in <asm/asmregs.h> using ".reg", and when using
+current binutils (snapshot 2.40.50.20230611) the definitions in
+<asm/assembly.h> using "=" conflict with those:
+
+arch/parisc/include/asm/assembly.h: Assembler messages:
+arch/parisc/include/asm/assembly.h:93: Error: symbol `sp' is already defined
+arch/parisc/include/asm/assembly.h:95: Error: symbol `ipsw' is already defined
+
+Delete the duplicate definitions in <asm/assembly.h>.
+
+Also delete the definition of gp, which isn't used anywhere.
+
+Signed-off-by: Ben Hutchings <benh@debian.org>
+Cc: stable@vger.kernel.org # v6.0+
+Signed-off-by: Helge Deller <deller@gmx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/parisc/include/asm/assembly.h | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/arch/parisc/include/asm/assembly.h b/arch/parisc/include/asm/assembly.h
+index 0f0d4a496fef..75677b526b2b 100644
+--- a/arch/parisc/include/asm/assembly.h
++++ b/arch/parisc/include/asm/assembly.h
+@@ -90,10 +90,6 @@
+ #include <asm/asmregs.h>
+ #include <asm/psw.h>
+ 
+-      sp      =       30
+-      gp      =       27
+-      ipsw    =       22
+-
+       /*
+        * We provide two versions of each macro to convert from physical
+        * to virtual and vice versa. The "_r1" versions take one argument
+-- 
+2.41.0
+

diff --git a/queue-6.1/series b/queue-6.1/series
index 857abd278dfe82d2681f4cff0c96eacf85cc4290..4b9c27310442b580d48ce91a128ca969e41715ea 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -152,3 +152,4 @@ net-tipc-resize-nlattr-array-to-correct-size.patch
 selftests-ptp-fix-timestamp-printf-format-for-ptp_sy.patch
 octeon_ep-add-missing-check-for-ioremap.patch
 afs-fix-vlserver-probe-rtt-handling.patch
+parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch