diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-10-15 21:16:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-15 19:37:50 -0700 |
| commit | 99d6734f3ca66c17b81df85724953a9b29eff7cf (patch) | |
| tree | 65ad0e615a1809df7daed7183d1805b16941aca8 | |
| parent | 79b5dc0c64d88cda3da23b2e22a5cec0964372ac (diff) | |
| download | op-kernel-dev-99d6734f3ca66c17b81df85724953a9b29eff7cf.zip op-kernel-dev-99d6734f3ca66c17b81df85724953a9b29eff7cf.tar.gz | |
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 <kyle@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/m32r/kernel/signal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 7bbe386..cc36fe1 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, |
