diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 11:18:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 11:18:43 -0400 |
| commit | 12dce6263d43daeb4e16fa4eb964c1c99fa4fa2e (patch) | |
| tree | e70a514e5fec67be191e12eba508db8ced967a4b /arch/mips/kernel/scall64-n32.S | |
| parent | 3f2e05e90e0846c42626e3d272454f26be34a1bc (diff) | |
| parent | 04b314b2c3732bb5aa752fdbb3076de16decdab6 (diff) | |
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
Diffstat (limited to 'arch/mips/kernel/scall64-n32.S')
| -rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 33 | #ifndef CONFIG_MIPS32_O32 | 33 | #ifndef CONFIG_MIPS32_O32 |
| 34 | .set noat | 34 | .set noat |
| 35 | SAVE_SOME | 35 | SAVE_SOME |
| 36 | TRACE_IRQS_ON | 36 | TRACE_IRQS_ON_RELOAD |
| 37 | STI | 37 | STI |
| 38 | .set at | 38 | .set at |
| 39 | #endif | 39 | #endif |