4 files changed, 4 insertions, 15 deletions

diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index e71785102206..61362e6fa9ec 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -28,18 +28,7 @@
 NESTED(handle_sys, PT_SIZE, sp)
         .set    noat
         SAVE_SOME
-#ifdef CONFIG_TRACE_IRQFLAGS
-        TRACE_IRQS_ON
-#ifdef CONFIG_64BIT
-        LONG_L  $8, PT_R8(sp)
-        LONG_L  $9, PT_R9(sp)
-#endif
-        LONG_L  $7, PT_R7(sp)
-        LONG_L  $6, PT_R6(sp)
-        LONG_L  $5, PT_R5(sp)
-        LONG_L  $4, PT_R4(sp)
-        LONG_L  $2, PT_R2(sp)
-#endif
+        TRACE_IRQS_ON_RELOAD
         STI
         .set    at
 
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 4c22d0b4825d..6c7b5ed0ea6e 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -34,7 +34,7 @@ NESTED(handle_sys64, PT_SIZE, sp)
          */
         .set    noat
         SAVE_SOME
-        TRACE_IRQS_ON
+        TRACE_IRQS_ON_RELOAD
         STI
         .set    at
 #endif
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index f25c2a2f1038..6d9f18727ac5 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -33,7 +33,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)
 #ifndef CONFIG_MIPS32_O32
         .set    noat
         SAVE_SOME
-        TRACE_IRQS_ON
+        TRACE_IRQS_ON_RELOAD
         STI
         .set    at
 #endif
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 288ee4ac4dbb..2e6d0673163e 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -28,7 +28,7 @@
 NESTED(handle_sys, PT_SIZE, sp)
         .set    noat
         SAVE_SOME
-        TRACE_IRQS_ON
+        TRACE_IRQS_ON_RELOAD
         STI
         .set    at
         ld      t1, PT_EPC(sp)          # skip syscall on return