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(+) (limited to 'arch/m32r/kernel') diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 7bbe38645ed5..cc36fe149255 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 v1.2.3-70-g09d2 From 388d148fe89cbdd99ec6bcab6cf34480e74c50ee Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Fri, 15 Oct 2010 21:17:09 -0400 Subject: m32r: get_user takes an lvalue, not a pointer Signed-off-by: Kyle McMartin Acked-by: Al "my fuckup" Viro Signed-off-by: Linus Torvalds --- arch/m32r/kernel/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/m32r/kernel') diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index cc36fe149255..a08697f0886d 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c @@ -256,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; -- cgit v1.2.3-70-g09d2 From 4f515cc93248face6ba45dd296dc3e7381848ab7 Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Fri, 15 Oct 2010 21:17:13 -0400 Subject: m32r: add kernel/.gitignore and ignore vmlinux.lds Signed-off-by: Kyle McMartin Signed-off-by: Linus Torvalds --- arch/m32r/kernel/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 arch/m32r/kernel/.gitignore (limited to 'arch/m32r/kernel') diff --git a/arch/m32r/kernel/.gitignore b/arch/m32r/kernel/.gitignore new file mode 100644 index 000000000000..c5f676c3c224 --- /dev/null +++ b/arch/m32r/kernel/.gitignore @@ -0,0 +1 @@ +vmlinux.lds -- cgit v1.2.3-70-g09d2