This complements commit 8c56208aff77 ("MIPS: lib: memset: Add MIPS R6
support").
Signed-off-by: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx>
---
Noticed with a CPU_DADDI_WORKAROUNDS build triggering:
arch/mips/lib/memset.S: Assembler messages:
arch/mips/lib/memset.S:210: Warning: Macro instruction expanded into multiple instructions in a branch delay slot
-- a harmless warning however, as this code is never reached, not even
referred.
Please apply.
Maciej
linux-mips-memset-r6-fix.patch
Index: linux-4maxp64/arch/mips/lib/memset.S
===================================================================
--- linux-4maxp64.orig/arch/mips/lib/memset.S
+++ linux-4maxp64/arch/mips/lib/memset.S
@@ -228,10 +228,12 @@
.hidden __memset
.endif
+#ifdef CONFIG_CPU_MIPSR6
.Lbyte_fixup\@:
PTR_SUBU a2, $0, t0
jr ra
PTR_ADDIU a2, 1
+#endif /* CONFIG_CPU_MIPSR6 */
.Lfirst_fixup\@:
jr ra
