From 99d6734f3ca66c17b81df85724953a9b29eff7cf Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Fri, 15 Oct 2010 21:16:45 -0400 Subject: m32r: restore _BLOCKABLE Commit a7f8388e accidentally removed it... Al explains: "Sorry, reordering breakage. In the signals tree here I have static inline void sig_set_blocked(struct sigset_t *set) ... and it's used all over the place (including quite a few places where we currently have sigprocmask(SIG_SETMASK, set, NULL), which is what it's equivalent to). With that done, m32r doesn't use _BLOCKABLE anywhere, so it got removed. And that chunk got picked when I'd been reordering the queue to pull the arch-specific fixes in front. Sorry." Signed-off-by: Kyle McMartin Cc: Al Viro Signed-off-by: Linus Torvalds --- arch/m32r/kernel/signal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 7bbe38645ed555..cc36fe1492555c 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c @@ -28,6 +28,8 @@ #define DEBUG_SIG 0 +#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) + asmlinkage int sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, unsigned long r2, unsigned long r3, unsigned long r4, -- cgit 1.2.3-korg