diff options
Diffstat (limited to 'arch/sparc/kernel/rtrap.S')
-rw-r--r-- | arch/sparc/kernel/rtrap.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S index ce30082ab266..4da2e1f66290 100644 --- a/arch/sparc/kernel/rtrap.S +++ b/arch/sparc/kernel/rtrap.S | |||
@@ -69,12 +69,13 @@ ret_trap_lockless_ipi: | |||
69 | 69 | ||
70 | ld [%curptr + TI_FLAGS], %g2 | 70 | ld [%curptr + TI_FLAGS], %g2 |
71 | signal_p: | 71 | signal_p: |
72 | andcc %g2, (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK), %g0 | 72 | andcc %g2, _TIF_DO_NOTIFY_RESUME_MASK, %g0 |
73 | bz,a ret_trap_continue | 73 | bz,a ret_trap_continue |
74 | ld [%sp + STACKFRAME_SZ + PT_PSR], %t_psr | 74 | ld [%sp + STACKFRAME_SZ + PT_PSR], %t_psr |
75 | 75 | ||
76 | mov %g2, %o2 | ||
76 | mov %l5, %o1 | 77 | mov %l5, %o1 |
77 | call do_signal | 78 | call do_notify_resume |
78 | add %sp, STACKFRAME_SZ, %o0 ! pt_regs ptr | 79 | add %sp, STACKFRAME_SZ, %o0 ! pt_regs ptr |
79 | 80 | ||
80 | /* Fall through. */ | 81 | /* Fall through. */ |
@@ -224,8 +225,6 @@ ret_trap_user_stack_is_bolixed: | |||
224 | b signal_p | 225 | b signal_p |
225 | ld [%curptr + TI_FLAGS], %g2 | 226 | ld [%curptr + TI_FLAGS], %g2 |
226 | 227 | ||
227 | |||
228 | .globl sun4c_rett_stackchk | ||
229 | sun4c_rett_stackchk: | 228 | sun4c_rett_stackchk: |
230 | be 1f | 229 | be 1f |
231 | and %fp, 0xfff, %g1 ! delay slot | 230 | and %fp, 0xfff, %g1 ! delay slot |