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/h8300 | |
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/h8300')
-rw-r--r-- | arch/h8300/kernel/signal.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c index 8fbfc39574f5..aa6f09666915 100644 --- a/arch/h8300/kernel/signal.c +++ b/arch/h8300/kernel/signal.c | |||
@@ -47,8 +47,6 @@ | |||
47 | #include <asm/traps.h> | 47 | #include <asm/traps.h> |
48 | #include <asm/ucontext.h> | 48 | #include <asm/ucontext.h> |
49 | 49 | ||
50 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | ||
51 | |||
52 | /* | 50 | /* |
53 | * Atomically swap in the new signal mask, and wait for a signal. | 51 | * Atomically swap in the new signal mask, and wait for a signal. |
54 | */ | 52 | */ |
@@ -186,7 +184,6 @@ asmlinkage int do_sigreturn(unsigned long __unused,...) | |||
186 | sizeof(frame->extramask)))) | 184 | sizeof(frame->extramask)))) |
187 | goto badframe; | 185 | goto badframe; |
188 | 186 | ||
189 | sigdelsetmask(&set, ~_BLOCKABLE); | ||
190 | set_current_blocked(&set); | 187 | set_current_blocked(&set); |
191 | 188 | ||
192 | if (restore_sigcontext(regs, &frame->sc, &er0)) | 189 | if (restore_sigcontext(regs, &frame->sc, &er0)) |
@@ -211,7 +208,6 @@ asmlinkage int do_rt_sigreturn(unsigned long __unused,...) | |||
211 | if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) | 208 | if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) |
212 | goto badframe; | 209 | goto badframe; |
213 | 210 | ||
214 | sigdelsetmask(&set, ~_BLOCKABLE); | ||
215 | set_current_blocked(&set); | 211 | set_current_blocked(&set); |
216 | 212 | ||
217 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &er0)) | 213 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &er0)) |