From 6244dbb3efbd298af5a532de24b1afdf9c550fba Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 14 Feb 2022 08:16:26 +0100 Subject: [PATCH] 5.16-stable patches added patches: mips-octeon-fix-missed-ptr-ptr_wd-conversion.patch --- ...eon-fix-missed-ptr-ptr_wd-conversion.patch | 27 +++++++++++++++++++ queue-5.16/series | 1 + 2 files changed, 28 insertions(+) create mode 100644 queue-5.16/mips-octeon-fix-missed-ptr-ptr_wd-conversion.patch diff --git a/queue-5.16/mips-octeon-fix-missed-ptr-ptr_wd-conversion.patch b/queue-5.16/mips-octeon-fix-missed-ptr-ptr_wd-conversion.patch new file mode 100644 index 00000000000..1002aaf159d --- /dev/null +++ b/queue-5.16/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 +Date: Mon, 31 Jan 2022 11:07:02 +0100 +Subject: MIPS: octeon: Fix missed PTR->PTR_WD conversion + +From: Thomas Bogendoerfer + +commit 50317b636e7184d15126e2dfc83db0963a38d31e upstream. + +Fixes: fa62f39dc7e2 ("MIPS: Fix build error due to PTR used in more places") +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Greg Kroah-Hartman +--- + 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.16/series b/queue-5.16/series index ce888cff68d..5c66a93601d 100644 --- a/queue-5.16/series +++ b/queue-5.16/series @@ -195,3 +195,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 -- 2.47.3