1 files changed, 13 insertions, 2 deletions

diff --git a/arch/mips/lib/strnlen_user.S b/arch/mips/lib/strnlen_user.S
index 7d12c0dded3d..77e64942f004 100644
--- a/arch/mips/lib/strnlen_user.S
+++ b/arch/mips/lib/strnlen_user.S
@@ -34,7 +34,12 @@ LEAF(__strnlen_\func\()_asm)
 FEXPORT(__strnlen_\func\()_nocheck_asm)
         move            v0, a0
         PTR_ADDU        a1, a0                  # stop pointer
-1:      beq             v0, a1, 1f              # limit reached?
+1:
+#ifdef CONFIG_CPU_DADDI_WORKAROUNDS
+        .set            noat
+        li              AT, 1
+#endif
+        beq             v0, a1, 1f              # limit reached?
 .ifeqs "\func", "kernel"
         EX(lb, t0, (v0), .Lfault\@)
 .else
@@ -42,7 +47,13 @@ FEXPORT(__strnlen_\func\()_nocheck_asm)
 .endif
         .set            noreorder
         bnez            t0, 1b
-1:       PTR_ADDIU      v0, 1
+1:
+#ifndef CONFIG_CPU_DADDI_WORKAROUNDS
+         PTR_ADDIU      v0, 1
+#else
+         PTR_ADDU       v0, AT
+        .set            at
+#endif
         .set            reorder
         PTR_SUBU        v0, a0
         jr              ra