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/parisc | |
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/parisc')
-rw-r--r-- | arch/parisc/kernel/signal.c | 4 | ||||
-rw-r--r-- | arch/parisc/kernel/signal32.c | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c index 7f3c8f2c962d..25161eaf720d 100644 --- a/arch/parisc/kernel/signal.c +++ b/arch/parisc/kernel/signal.c | |||
@@ -48,9 +48,6 @@ | |||
48 | #define DBG(LEVEL, ...) | 48 | #define DBG(LEVEL, ...) |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | |||
52 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | ||
53 | |||
54 | /* gcc will complain if a pointer is cast to an integer of different | 51 | /* gcc will complain if a pointer is cast to an integer of different |
55 | * size. If you really need to do this (and we do for an ELF32 user | 52 | * size. If you really need to do this (and we do for an ELF32 user |
56 | * application in an ELF64 kernel) then you have to do a cast to an | 53 | * application in an ELF64 kernel) then you have to do a cast to an |
@@ -131,7 +128,6 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall) | |||
131 | goto give_sigsegv; | 128 | goto give_sigsegv; |
132 | } | 129 | } |
133 | 130 | ||
134 | sigdelsetmask(&set, ~_BLOCKABLE); | ||
135 | set_current_blocked(&set); | 131 | set_current_blocked(&set); |
136 | 132 | ||
137 | /* Good thing we saved the old gr[30], eh? */ | 133 | /* Good thing we saved the old gr[30], eh? */ |
diff --git a/arch/parisc/kernel/signal32.c b/arch/parisc/kernel/signal32.c index e14132430762..fd49aeda9eb8 100644 --- a/arch/parisc/kernel/signal32.c +++ b/arch/parisc/kernel/signal32.c | |||
@@ -47,8 +47,6 @@ | |||
47 | #define DBG(LEVEL, ...) | 47 | #define DBG(LEVEL, ...) |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | ||
51 | |||
52 | inline void | 50 | inline void |
53 | sigset_32to64(sigset_t *s64, compat_sigset_t *s32) | 51 | sigset_32to64(sigset_t *s64, compat_sigset_t *s32) |
54 | { | 52 | { |