From e08f457c7c0cc7720f28349f8780ea752c063441 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 14 May 2007 12:52:56 +0900 Subject: sh: __user annotations for __get/__put_user(). This adds in some more __user annotations. These weren't being handled properly in some of the __get_user and __put_user paths, so tidy those up. Signed-off-by: Paul Mundt --- arch/sh/kernel/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/sh/kernel/traps.c') diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index 5b75cb6f8f9b..299b8cf0f512 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c @@ -581,7 +581,7 @@ uspace_segv: info.si_signo = SIGBUS; info.si_errno = 0; info.si_code = si_code; - info.si_addr = (void *) address; + info.si_addr = (void __user *)address; force_sig_info(SIGBUS, &info, current); } else { if (regs->pc & 1) -- cgit v1.2.3 From 882c12c4e1a95e55227f06dbb99eca90f237c018 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 14 May 2007 17:26:34 +0900 Subject: sh: Shut up SH2-DSP compile warnings. Signed-off-by: Paul Mundt --- arch/sh/kernel/process.c | 2 +- arch/sh/kernel/traps.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/sh/kernel/traps.c') diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c index aa9c8112140b..9ae3da00eaae 100644 --- a/arch/sh/kernel/process.c +++ b/arch/sh/kernel/process.c @@ -406,8 +406,8 @@ asmlinkage int sys_fork(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7, struct pt_regs __regs) { - struct pt_regs *regs = RELOC_HIDE(&__regs, 0); #ifdef CONFIG_MMU + struct pt_regs *regs = RELOC_HIDE(&__regs, 0); return do_fork(SIGCHLD, regs->regs[15], regs, 0, NULL, NULL); #else /* fork almost works, enough to trick you into looking elsewhere :-( */ diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index 299b8cf0f512..9c7fb922dfe0 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c @@ -614,7 +614,7 @@ uspace_segv: */ int is_dsp_inst(struct pt_regs *regs) { - unsigned short inst; + unsigned short inst = 0; /* * Safe guard if DSP mode is already enabled or we're lacking -- cgit v1.2.3 From b66d51cb8039cf80b8aa5b157ed055cdea811104 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 1 Jun 2007 17:26:13 +0900 Subject: sh: Tidy compiler warnings for SH-2A build. Signed-off-by: Paul Mundt --- arch/sh/kernel/signal.c | 1 + arch/sh/kernel/traps.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/sh/kernel/traps.c') diff --git a/arch/sh/kernel/signal.c b/arch/sh/kernel/signal.c index 4fc5b402b21b..2d9131fbc690 100644 --- a/arch/sh/kernel/signal.c +++ b/arch/sh/kernel/signal.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index 9c7fb922dfe0..b97e71dae579 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c @@ -642,7 +642,6 @@ asmlinkage void do_divide_error(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7, struct pt_regs __regs) { - struct pt_regs *regs = RELOC_HIDE(&__regs, 0); siginfo_t info; switch (r4) { -- cgit v1.2.3