Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Remove unused galileo-boars header files
  [MIPS] Rename SERIAL_PORT_DEFNS for EV64120
  [MIPS] Add UART IRQ number for EV64120
  [MIPS] Remove excite_flash.c
  [MIPS] Update i8259 resources.
  [MIPS] Make unwind_stack() can dig into interrupted context
  [MIPS] Stacktrace build-fix and improvement
  [MIPS] QEMU: Add support for little endian mips
  [MIPS] Remove __flush_icache_page
  [MIPS] lockdep: update defconfigs
  [MIPS] lockdep: Add STACKTRACE_SUPPORT and enable LOCKDEP_SUPPORT
  [MIPS] lockdep: fix TRACE_IRQFLAGS_SUPPORT

1 files changed, 1 insertions, 12 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