From 490cf0cc315d6026facd6942033eda62c325b358 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 19 Jun 2023 08:15:13 +0200 Subject: [PATCH] 6.3-stable patches added patches: parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch --- ...gister-definitions-in-asm-assembly.h.patch | 42 +++++++++++++++++++ queue-6.3/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 queue-6.3/parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch diff --git a/queue-6.3/parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch b/queue-6.3/parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch new file mode 100644 index 00000000000..4bcd5c052fe --- /dev/null +++ b/queue-6.3/parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch @@ -0,0 +1,42 @@ +From b5b2a02bcaac7c287694aa0db4837a07bf178626 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Thu, 15 Jun 2023 00:00:02 +0200 +Subject: parisc: Delete redundant register definitions in + +From: Ben Hutchings + +commit b5b2a02bcaac7c287694aa0db4837a07bf178626 upstream. + +We define sp and ipsw in using ".reg", and when using +current binutils (snapshot 2.40.50.20230611) the definitions in + 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 . + +Also delete the definition of gp, which isn't used anywhere. + +Signed-off-by: Ben Hutchings +Cc: stable@vger.kernel.org # v6.0+ +Signed-off-by: Helge Deller +Signed-off-by: Greg Kroah-Hartman +--- + arch/parisc/include/asm/assembly.h | 4 ---- + 1 file changed, 4 deletions(-) + +--- a/arch/parisc/include/asm/assembly.h ++++ b/arch/parisc/include/asm/assembly.h +@@ -90,10 +90,6 @@ + #include + #include + +- 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 diff --git a/queue-6.3/series b/queue-6.3/series index 639da1a20fa..06824a6f3dc 100644 --- a/queue-6.3/series +++ b/queue-6.3/series @@ -180,3 +180,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 -- 2.47.2