1 files changed, 8 insertions, 7 deletions

diff --git a/arch/mips/lib/strncpy_user.S b/arch/mips/lib/strncpy_user.S
index d16c76fbfac7..7201b2ff08c8 100644
--- a/arch/mips/lib/strncpy_user.S
+++ b/arch/mips/lib/strncpy_user.S
@@ -30,29 +30,30 @@
 LEAF(__strncpy_from_user_asm)
         LONG_L          v0, TI_ADDR_LIMIT($28)  # pointer ok?
         and             v0, a1
-        bnez            v0, fault
+        bnez            v0, .Lfault
 
 FEXPORT(__strncpy_from_user_nocheck_asm)
         move            v0, zero
         move            v1, a1
         .set            noreorder
-1:      EX(lbu, t0, (v1), fault)
+1:      EX(lbu, t0, (v1), .Lfault)
         PTR_ADDIU       v1, 1
+        R10KCBARRIER(0(ra))
         beqz            t0, 2f
          sb             t0, (a0)
         PTR_ADDIU       v0, 1
-        bne             v0, a2, 1b
-         PTR_ADDIU      a0, 1
         .set            reorder
+        PTR_ADDIU       a0, 1
+        bne             v0, a2, 1b
 2:      PTR_ADDU        t0, a1, v0
         xor             t0, a1
-        bltz            t0, fault
+        bltz            t0, .Lfault
         jr              ra                      # return n
         END(__strncpy_from_user_asm)
 
-fault:  li              v0, -EFAULT
+.Lfault:        li              v0, -EFAULT
         jr              ra
 
         .section        __ex_table,"a"
-        PTR             1b, fault
+        PTR             1b, .Lfault
         .previous