diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-21 23:42:15 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 12:58:49 -0400 |
commit | a610d6e672d6d3723e8da257ad4a8a288a8f2f89 (patch) | |
tree | 2fac6ce7f72756771f4f87583205cc402589dcad /arch/sparc/kernel/signal32.c | |
parent | 5754f412a3f107cbcd93ee125bef296f2a07539b (diff) |
pull clearing RESTORE_SIGMASK into block_sigmask()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sparc/kernel/signal32.c')
-rw-r--r-- | arch/sparc/kernel/signal32.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c index 88e0d8122d2c..8c93c00922a7 100644 --- a/arch/sparc/kernel/signal32.c +++ b/arch/sparc/kernel/signal32.c | |||
@@ -775,7 +775,7 @@ sigsegv: | |||
775 | return -EFAULT; | 775 | return -EFAULT; |
776 | } | 776 | } |
777 | 777 | ||
778 | static inline int handle_signal32(unsigned long signr, struct k_sigaction *ka, | 778 | static inline void handle_signal32(unsigned long signr, struct k_sigaction *ka, |
779 | siginfo_t *info, | 779 | siginfo_t *info, |
780 | sigset_t *oldset, struct pt_regs *regs) | 780 | sigset_t *oldset, struct pt_regs *regs) |
781 | { | 781 | { |
@@ -787,12 +787,10 @@ static inline int handle_signal32(unsigned long signr, struct k_sigaction *ka, | |||
787 | err = setup_frame32(ka, regs, signr, oldset); | 787 | err = setup_frame32(ka, regs, signr, oldset); |
788 | 788 | ||
789 | if (err) | 789 | if (err) |
790 | return err; | 790 | return; |
791 | 791 | ||
792 | block_sigmask(ka, signr); | 792 | block_sigmask(ka, signr); |
793 | tracehook_signal_handler(signr, info, ka, regs, 0); | 793 | tracehook_signal_handler(signr, info, ka, regs, 0); |
794 | |||
795 | return 0; | ||
796 | } | 794 | } |
797 | 795 | ||
798 | static inline void syscall_restart32(unsigned long orig_i0, struct pt_regs *regs, | 796 | static inline void syscall_restart32(unsigned long orig_i0, struct pt_regs *regs, |
@@ -841,14 +839,7 @@ void do_signal32(sigset_t *oldset, struct pt_regs * regs) | |||
841 | if (signr > 0) { | 839 | if (signr > 0) { |
842 | if (restart_syscall) | 840 | if (restart_syscall) |
843 | syscall_restart32(orig_i0, regs, &ka.sa); | 841 | syscall_restart32(orig_i0, regs, &ka.sa); |
844 | if (handle_signal32(signr, &ka, &info, oldset, regs) == 0) { | 842 | handle_signal32(signr, &ka, &info, oldset, regs); |
845 | /* A signal was successfully delivered; the saved | ||
846 | * sigmask will have been stored in the signal frame, | ||
847 | * and will be restored by sigreturn, so we can simply | ||
848 | * clear the TS_RESTORE_SIGMASK flag. | ||
849 | */ | ||
850 | current_thread_info()->status &= ~TS_RESTORE_SIGMASK; | ||
851 | } | ||
852 | return; | 843 | return; |
853 | } | 844 | } |
854 | if (restart_syscall && | 845 | if (restart_syscall && |