diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-19 22:17:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-19 22:17:38 -0800 |
| commit | 02829f73774fa1f6c0a28f4018caaa7c94399c4a (patch) | |
| tree | c6eeee5cda3a0516a63ccc5e08d5d3855b957122 /arch/sparc/kernel/rtrap.S | |
| parent | 497992917edf03994088ec8757b8262e1d9f568a (diff) | |
| parent | 2d7d5f05111a9d913131a2764d8b20157f8f758d (diff) | |
| download | talos-op-linux-02829f73774fa1f6c0a28f4018caaa7c94399c4a.tar.gz talos-op-linux-02829f73774fa1f6c0a28f4018caaa7c94399c4a.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc/kernel/rtrap.S')
| -rw-r--r-- | arch/sparc/kernel/rtrap.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S index f7460d897e79..77ca6fd81253 100644 --- a/arch/sparc/kernel/rtrap.S +++ b/arch/sparc/kernel/rtrap.S @@ -68,15 +68,14 @@ ret_trap_lockless_ipi: ld [%curptr + TI_FLAGS], %g2 signal_p: - andcc %g2, (_TIF_NOTIFY_RESUME|_TIF_SIGPENDING), %g0 + andcc %g2, (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK), %g0 bz,a ret_trap_continue ld [%sp + STACKFRAME_SZ + PT_PSR], %t_psr - clr %o0 - mov %l5, %o2 - mov %l6, %o3 + mov %l5, %o1 + mov %l6, %o2 call do_signal - add %sp, STACKFRAME_SZ, %o1 ! pt_regs ptr + add %sp, STACKFRAME_SZ, %o0 ! pt_regs ptr /* Fall through. */ ld [%sp + STACKFRAME_SZ + PT_PSR], %t_psr |
