3 files changed, 25 insertions, 11 deletions

diff --git a/arch/mips/lib/csum_partial.S b/arch/mips/lib/csum_partial.S
index 2e4825e48388..9901237563c5 100644
--- a/arch/mips/lib/csum_partial.S
+++ b/arch/mips/lib/csum_partial.S
@@ -56,14 +56,20 @@
 #define UNIT(unit)  ((unit)*NBYTES)
 
 #define ADDC(sum,reg)                                           \
+        .set    push;                                           \
+        .set    noat;                                           \
         ADD     sum, reg;                                       \
         sltu    v1, sum, reg;                                   \
         ADD     sum, v1;                                        \
+        .set    pop
 
 #define ADDC32(sum,reg)                                         \
+        .set    push;                                           \
+        .set    noat;                                           \
         addu    sum, reg;                                       \
         sltu    v1, sum, reg;                                   \
         addu    sum, v1;                                        \
+        .set    pop
 
 #define CSUM_BIGCHUNK1(src, offset, sum, _t0, _t1, _t2, _t3)    \
         LOAD    _t0, (offset + UNIT(0))(src);                   \
@@ -710,6 +716,8 @@ LEAF(csum_partial)
         ADDC(sum, t2)
 .Ldone\@:
         /* fold checksum */
+        .set    push
+        .set    noat
 #ifdef USE_DOUBLE
         dsll32  v1, sum, 0
         daddu   sum, v1
@@ -732,6 +740,7 @@ LEAF(csum_partial)
         or      sum, sum, t0
 1:
 #endif
+        .set    pop
         .set reorder
         ADDC32(sum, psum)
         jr      ra
diff --git a/arch/mips/lib/delay.c b/arch/mips/lib/delay.c
index 44713af15a62..705cfb7c1a74 100644
--- a/arch/mips/lib/delay.c
+++ b/arch/mips/lib/delay.c
@@ -6,7 +6,7 @@
  * Copyright (C) 1994 by Waldorf Electronics
  * Copyright (C) 1995 - 2000, 01, 03 by Ralf Baechle
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
- * Copyright (C) 2007  Maciej W. Rozycki
+ * Copyright (C) 2007, 2014 Maciej W. Rozycki
  */
 #include <linux/module.h>
 #include <linux/param.h>
@@ -15,6 +15,12 @@
 #include <asm/compiler.h>
 #include <asm/war.h>
 
+#ifndef CONFIG_CPU_DADDI_WORKAROUNDS
+#define GCC_DADDI_IMM_ASM() "I"
+#else
+#define GCC_DADDI_IMM_ASM() "r"
+#endif
+
 void __delay(unsigned long loops)
 {
         __asm__ __volatile__ (
@@ -22,13 +28,13 @@ void __delay(unsigned long loops)
         "       .align  3                                       \n"
         "1:     bnez    %0, 1b                                  \n"
 #if BITS_PER_LONG == 32
-        "       subu    %0, 1                                   \n"
+        "       subu    %0, %1                                  \n"
 #else
-        "       dsubu   %0, 1                                   \n"
+        "       dsubu   %0, %1                                  \n"
 #endif
         "       .set    reorder                                 \n"
         : "=r" (loops)
-        : "0" (loops));
+        : GCC_DADDI_IMM_ASM() (1), "0" (loops));
 }
 EXPORT_SYMBOL(__delay);
 
diff --git a/arch/mips/lib/strncpy_user.S b/arch/mips/lib/strncpy_user.S
index d3301cd1e9a5..3c32baf8b494 100644
--- a/arch/mips/lib/strncpy_user.S
+++ b/arch/mips/lib/strncpy_user.S
@@ -35,7 +35,6 @@ LEAF(__strncpy_from_\func\()_asm)
         bnez            v0, .Lfault\@
 
 FEXPORT(__strncpy_from_\func\()_nocheck_asm)
-        .set            noreorder
         move            t0, zero
         move            v1, a1
 .ifeqs "\func","kernel"
@@ -45,21 +44,21 @@ FEXPORT(__strncpy_from_\func\()_nocheck_asm)
 .endif
         PTR_ADDIU       v1, 1
         R10KCBARRIER(0(ra))
+        sb              v0, (a0)
         beqz            v0, 2f
-         sb             v0, (a0)
         PTR_ADDIU       t0, 1
+        PTR_ADDIU       a0, 1
         bne             t0, a2, 1b
-         PTR_ADDIU      a0, 1
 2:      PTR_ADDU        v0, a1, t0
         xor             v0, a1
         bltz            v0, .Lfault\@
-         nop
+        move            v0, t0
         jr              ra                      # return n
-         move           v0, t0
         END(__strncpy_from_\func\()_asm)
 
-.Lfault\@: jr           ra
-          li            v0, -EFAULT
+.Lfault\@:
+        li              v0, -EFAULT
+        jr              ra
 
         .section        __ex_table,"a"
         PTR             1b, .Lfault\@