1 files changed, 24 insertions, 6 deletions

diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h
index 1fae5dc58138..7afa1fdf70ca 100644
--- a/include/asm-mips/stackframe.h
+++ b/include/asm-mips/stackframe.h
@@ -29,16 +29,25 @@
                 .endm
 
                 .macro  SAVE_TEMP
+#ifdef CONFIG_CPU_HAS_SMARTMIPS
+                mflhxu  v1
+                LONG_S  v1, PT_LO(sp)
+                mflhxu  v1
+                LONG_S  v1, PT_HI(sp)
+                mflhxu  v1
+                LONG_S  v1, PT_ACX(sp)
+#else
                 mfhi    v1
+                LONG_S  v1, PT_HI(sp)
+                mflo    v1
+                LONG_S  v1, PT_LO(sp)
+#endif
 #ifdef CONFIG_32BIT
                 LONG_S  $8, PT_R8(sp)
                 LONG_S  $9, PT_R9(sp)
 #endif
-                LONG_S  v1, PT_HI(sp)
-                mflo    v1
                 LONG_S  $10, PT_R10(sp)
                 LONG_S  $11, PT_R11(sp)
-                LONG_S  v1,  PT_LO(sp)
                 LONG_S  $12, PT_R12(sp)
                 LONG_S  $13, PT_R13(sp)
                 LONG_S  $14, PT_R14(sp)
@@ -182,16 +191,25 @@
                 .endm
 
                 .macro  RESTORE_TEMP
+#ifdef CONFIG_CPU_HAS_SMARTMIPS
+                LONG_L  $24, PT_ACX(sp)
+                mtlhx   $24
+                LONG_L  $24, PT_HI(sp)
+                mtlhx   $24
                 LONG_L  $24, PT_LO(sp)
+                mtlhx   $24
+#else
+                LONG_L  $24, PT_LO(sp)
+                mtlo    $24
+                LONG_L  $24, PT_HI(sp)
+                mthi    $24
+#endif
 #ifdef CONFIG_32BIT
                 LONG_L  $8, PT_R8(sp)
                 LONG_L  $9, PT_R9(sp)
 #endif
-                mtlo    $24
-                LONG_L  $24, PT_HI(sp)
                 LONG_L  $10, PT_R10(sp)
                 LONG_L  $11, PT_R11(sp)
-                mthi    $24
                 LONG_L  $12, PT_R12(sp)
                 LONG_L  $13, PT_R13(sp)
                 LONG_L  $14, PT_R14(sp)