Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / sparc / kernel / rtrap.S

diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S
index f7460d8..77ca6fd 100644 (file)
--- 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