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/microblaze | |
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/microblaze')
-rw-r--r-- | arch/microblaze/kernel/signal.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c index 03641199666e..c662e68671a2 100644 --- a/arch/microblaze/kernel/signal.c +++ b/arch/microblaze/kernel/signal.c | |||
@@ -41,8 +41,6 @@ | |||
41 | #include <asm/cacheflush.h> | 41 | #include <asm/cacheflush.h> |
42 | #include <asm/syscalls.h> | 42 | #include <asm/syscalls.h> |
43 | 43 | ||
44 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | ||
45 | |||
46 | asmlinkage long | 44 | asmlinkage long |
47 | sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, | 45 | sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, |
48 | struct pt_regs *regs) | 46 | struct pt_regs *regs) |
@@ -106,7 +104,6 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) | |||
106 | if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) | 104 | if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) |
107 | goto badframe; | 105 | goto badframe; |
108 | 106 | ||
109 | sigdelsetmask(&set, ~_BLOCKABLE); | ||
110 | set_current_blocked(&set); | 107 | set_current_blocked(&set); |
111 | 108 | ||
112 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &rval)) | 109 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &rval)) |