1 files changed, 12 insertions, 3 deletions

diff --git a/arch/tile/kernel/traps.c b/arch/tile/kernel/traps.c
index 2bb6602a1ee7..73cff814ac57 100644
--- a/arch/tile/kernel/traps.c
+++ b/arch/tile/kernel/traps.c
@@ -200,7 +200,7 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
 {
         siginfo_t info = { 0 };
         int signo, code;
-        unsigned long address;
+        unsigned long address = 0;
         bundle_bits instr;
 
         /* Re-enable interrupts. */
@@ -223,6 +223,10 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
         }
 
         switch (fault_num) {
+        case INT_MEM_ERROR:
+                signo = SIGBUS;
+                code = BUS_OBJERR;
+                break;
         case INT_ILL:
                 if (copy_from_user(&instr, (void __user *)regs->pc,
                                    sizeof(instr))) {
@@ -289,7 +293,10 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
                 address = regs->pc;
                 break;
 #ifdef __tilegx__
-        case INT_ILL_TRANS:
+        case INT_ILL_TRANS: {
+                /* Avoid a hardware erratum with the return address stack. */
+                fill_ra_stack();
+
                 signo = SIGSEGV;
                 code = SEGV_MAPERR;
                 if (reason & SPR_ILL_TRANS_REASON__I_STREAM_VA_RMASK)
@@ -297,6 +304,7 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
                 else
                         address = 0;  /* FIXME: GX: single-step for address */
                 break;
+        }
 #endif
         default:
                 panic("Unexpected do_trap interrupt number %d", fault_num);
@@ -308,7 +316,8 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
         info.si_addr = (void __user *)address;
         if (signo == SIGILL)
                 info.si_trapno = fault_num;
-        trace_unhandled_signal("trap", regs, address, signo);
+        if (signo != SIGTRAP)
+                trace_unhandled_signal("trap", regs, address, signo);
         force_sig_info(signo, &info, current);
 }