diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-27 13:58:59 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 12:58:51 -0400 |
commit | 77097ae503b170120ab66dd1d547f8577193f91f (patch) | |
tree | bee5b2e8d91b9ec8ab74c58cbec1796c7bacc2e5 /arch/m32r/kernel | |
parent | edd63a2763bdae0daa4f0a4d4c5d61d1154352a5 (diff) |
most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set
Only 3 out of 63 do not. Renamed the current variant to __set_current_blocked(),
added set_current_blocked() that will exclude unblockable signals, switched
open-coded instances to it.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/m32r/kernel')
-rw-r--r-- | arch/m32r/kernel/signal.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 7cbfa639fbfa..07f9032576c0 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c | |||
@@ -28,8 +28,6 @@ | |||
28 | 28 | ||
29 | #define DEBUG_SIG 0 | 29 | #define DEBUG_SIG 0 |
30 | 30 | ||
31 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | ||
32 | |||
33 | asmlinkage int | 31 | asmlinkage int |
34 | sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, | 32 | sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, |
35 | unsigned long r2, unsigned long r3, unsigned long r4, | 33 | unsigned long r2, unsigned long r3, unsigned long r4, |
@@ -111,7 +109,6 @@ sys_rt_sigreturn(unsigned long r0, unsigned long r1, | |||
111 | if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) | 109 | if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) |
112 | goto badframe; | 110 | goto badframe; |
113 | 111 | ||
114 | sigdelsetmask(&set, ~_BLOCKABLE); | ||
115 | set_current_blocked(&set); | 112 | set_current_blocked(&set); |
116 | 113 | ||
117 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &result)) | 114 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &result)) |