diff options
| author | Alex Elder <aelder@sgi.com> | 2010-10-21 08:29:34 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-10-21 08:29:34 -0500 |
| commit | 39dc948c6921169e13224a97fa53188922acfde8 (patch) | |
| tree | ef9c310031ebc21321d9f10ca6afea90d37a2f57 /arch/m32r/kernel/signal.c | |
| parent | a731cd116c9334e01bcf3e676c0c621fe7de6ce4 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge branch 'v2.6.36'
Diffstat (limited to 'arch/m32r/kernel/signal.c')
| -rw-r--r-- | arch/m32r/kernel/signal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 7bbe38645ed5..a08697f0886d 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, @@ -254,7 +256,7 @@ give_sigsegv: static int prev_insn(struct pt_regs *regs) { u16 inst; - if (get_user(&inst, (u16 __user *)(regs->bpc - 2))) + if (get_user(inst, (u16 __user *)(regs->bpc - 2))) return -EFAULT; if ((inst & 0xfff0) == 0x10f0) /* trap ? */ regs->bpc -= 2; |