diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 16:16:15 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 16:16:15 +0200 |
commit | 1a10390708d675ebf1a2f5e169a5165626afbd88 (patch) | |
tree | d9ee7d10abd65e580fb74152a501089f51174225 /arch/sparc/kernel/rtrap.S | |
parent | 239bd83104ec6bcba90221d8b0973d2565142ef8 (diff) | |
parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) |
Merge branch 'linus' into x86/cpu
Diffstat (limited to 'arch/sparc/kernel/rtrap.S')
-rw-r--r-- | arch/sparc/kernel/rtrap.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S index 891f460b7b9..4da2e1f6629 100644 --- a/arch/sparc/kernel/rtrap.S +++ b/arch/sparc/kernel/rtrap.S @@ -69,12 +69,13 @@ ret_trap_lockless_ipi: ld [%curptr + TI_FLAGS], %g2 signal_p: - andcc %g2, (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK), %g0 + andcc %g2, _TIF_DO_NOTIFY_RESUME_MASK, %g0 bz,a ret_trap_continue ld [%sp + STACKFRAME_SZ + PT_PSR], %t_psr + mov %g2, %o2 mov %l5, %o1 - call do_signal + call do_notify_resume add %sp, STACKFRAME_SZ, %o0 ! pt_regs ptr /* Fall through. */ |