1 files changed, 2 insertions, 3 deletions

diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 09480887076b..05a40f3c30bf 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -584,7 +584,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)
@@ -617,7 +617,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
@@ -645,7 +645,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) {