5.15-stable patches

added patches:
	mips-octeon-fix-missed-ptr-ptr_wd-conversion.patch

diff --git a/queue-5.15/mips-octeon-fix-missed-ptr-ptr_wd-conversion.patch b/queue-5.15/mips-octeon-fix-missed-ptr-ptr_wd-conversion.patch
new file mode 100644 (file)
index 0000000..1002aaf
--- /dev/null
+++ b/queue-5.15/mips-octeon-fix-missed-ptr-ptr_wd-conversion.patch
@@ -0,0 +1,27 @@
+From 50317b636e7184d15126e2dfc83db0963a38d31e Mon Sep 17 00:00:00 2001
+From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+Date: Mon, 31 Jan 2022 11:07:02 +0100
+Subject: MIPS: octeon: Fix missed PTR->PTR_WD conversion
+
+From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+
+commit 50317b636e7184d15126e2dfc83db0963a38d31e upstream.
+
+Fixes: fa62f39dc7e2 ("MIPS: Fix build error due to PTR used in more places")
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/mips/cavium-octeon/octeon-memcpy.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/cavium-octeon/octeon-memcpy.S
++++ b/arch/mips/cavium-octeon/octeon-memcpy.S
+@@ -74,7 +74,7 @@
+ #define EXC(inst_reg,addr,handler)            \
+ 9:    inst_reg, addr;                         \
+       .section __ex_table,"a";                \
+-      PTR     9b, handler;                    \
++      PTR_WD  9b, handler;                    \
+       .previous
+ 
+ /*

diff --git a/queue-5.15/series b/queue-5.15/series
index 7d425b855b1ebdf131ed72164468ef1f36b9f15c..0941da1777c93ba546ad8c90a12279bcd50978f4 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -166,3 +166,4 @@ sched-fair-fix-fault-in-reweight_entity.patch
 makefile.extrawarn-move-wunaligned-access-to-w-1.patch
 scsi-lpfc-remove-nvme-support-if-kernel-has-nvme_fc-disabled.patch
 scsi-lpfc-reduce-log-messages-seen-after-firmware-download.patch
+mips-octeon-fix-missed-ptr-ptr_wd-conversion.patch