diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-13 01:45:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-13 01:45:15 -0400 |
| commit | 9a28dbf8af11d127bf1c644143e7882cb91515dd (patch) | |
| tree | 533dfbec4fca25330956d54094cae3dbd6a8d675 /arch/sparc64/kernel/rtrap.S | |
| parent | faa6cfde747ba6d37a0889cbe85881c80806d355 (diff) | |
sparc64: Use a TS_RESTORE_SIGMASK
This mirrors x86 changeset 5a8da0ea82db6fa9737041381079fd16f25dcce2
("signals: x86 TS_RESTORE_SIGMASK") on sparc64.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/rtrap.S')
| -rw-r--r-- | arch/sparc64/kernel/rtrap.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S index b9b785fd8b46..16689b2930db 100644 --- a/arch/sparc64/kernel/rtrap.S +++ b/arch/sparc64/kernel/rtrap.S | |||
| @@ -46,7 +46,7 @@ __handle_user_windows: | |||
| 46 | wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate | 46 | wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate |
| 47 | ldx [%g6 + TI_FLAGS], %l0 | 47 | ldx [%g6 + TI_FLAGS], %l0 |
| 48 | 48 | ||
| 49 | 1: andcc %l0, (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), %g0 | 49 | 1: andcc %l0, _TIF_SIGPENDING, %g0 |
| 50 | be,pt %xcc, __handle_user_windows_continue | 50 | be,pt %xcc, __handle_user_windows_continue |
| 51 | nop | 51 | nop |
| 52 | mov %l5, %o1 | 52 | mov %l5, %o1 |
| @@ -86,7 +86,7 @@ __handle_perfctrs: | |||
| 86 | wrpr %g0, RTRAP_PSTATE, %pstate | 86 | wrpr %g0, RTRAP_PSTATE, %pstate |
| 87 | wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate | 87 | wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate |
| 88 | ldx [%g6 + TI_FLAGS], %l0 | 88 | ldx [%g6 + TI_FLAGS], %l0 |
| 89 | 1: andcc %l0, (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), %g0 | 89 | 1: andcc %l0, _TIF_SIGPENDING, %g0 |
| 90 | 90 | ||
| 91 | be,pt %xcc, __handle_perfctrs_continue | 91 | be,pt %xcc, __handle_perfctrs_continue |
| 92 | sethi %hi(TSTATE_PEF), %o0 | 92 | sethi %hi(TSTATE_PEF), %o0 |
| @@ -195,7 +195,7 @@ __handle_preemption_continue: | |||
| 195 | andcc %l1, %o0, %g0 | 195 | andcc %l1, %o0, %g0 |
| 196 | andcc %l0, _TIF_NEED_RESCHED, %g0 | 196 | andcc %l0, _TIF_NEED_RESCHED, %g0 |
| 197 | bne,pn %xcc, __handle_preemption | 197 | bne,pn %xcc, __handle_preemption |
| 198 | andcc %l0, (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), %g0 | 198 | andcc %l0, _TIF_SIGPENDING, %g0 |
| 199 | bne,pn %xcc, __handle_signal | 199 | bne,pn %xcc, __handle_signal |
| 200 | __handle_signal_continue: | 200 | __handle_signal_continue: |
| 201 | ldub [%g6 + TI_WSAVED], %o2 | 201 | ldub [%g6 + TI_WSAVED], %o2 |