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/c6x/kernel/signal.c | |
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/c6x/kernel/signal.c')
-rw-r--r-- | arch/c6x/kernel/signal.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/c6x/kernel/signal.c b/arch/c6x/kernel/signal.c index d599a7fb5d24..eb1b3086ae00 100644 --- a/arch/c6x/kernel/signal.c +++ b/arch/c6x/kernel/signal.c | |||
@@ -20,8 +20,6 @@ | |||
20 | #include <asm/cacheflush.h> | 20 | #include <asm/cacheflush.h> |
21 | 21 | ||
22 | 22 | ||
23 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | ||
24 | |||
25 | /* | 23 | /* |
26 | * Do a signal return, undo the signal stack. | 24 | * Do a signal return, undo the signal stack. |
27 | */ | 25 | */ |
@@ -87,7 +85,6 @@ asmlinkage int do_rt_sigreturn(struct pt_regs *regs) | |||
87 | if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) | 85 | if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) |
88 | goto badframe; | 86 | goto badframe; |
89 | 87 | ||
90 | sigdelsetmask(&set, ~_BLOCKABLE); | ||
91 | set_current_blocked(&set); | 88 | set_current_blocked(&set); |
92 | 89 | ||
93 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) | 90 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) |