1 files changed, 27 insertions, 19 deletions

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index bf14da9f3e33..ae0c89d23ad7 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -56,6 +56,7 @@
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
 #include <asm/sections.h>
+#include <asm/siginfo.h>
 #include <asm/tlbdebug.h>
 #include <asm/traps.h>
 #include <asm/uaccess.h>
@@ -871,7 +872,7 @@ out:
         exception_exit(prev_state);
 }
 
-void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
+void do_trap_or_bp(struct pt_regs *regs, unsigned int code, int si_code,
         const char *str)
 {
         siginfo_t info = { 0 };
@@ -928,7 +929,13 @@ void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
         default:
                 scnprintf(b, sizeof(b), "%s instruction in kernel code", str);
                 die_if_kernel(b, regs);
-                force_sig(SIGTRAP, current);
+                if (si_code) {
+                        info.si_signo = SIGTRAP;
+                        info.si_code = si_code;
+                        force_sig_info(SIGTRAP, &info, current);
+                } else {
+                        force_sig(SIGTRAP, current);
+                }
         }
 }
 
@@ -1012,7 +1019,7 @@ asmlinkage void do_bp(struct pt_regs *regs)
                 break;
         }
 
-        do_trap_or_bp(regs, bcode, "Break");
+        do_trap_or_bp(regs, bcode, TRAP_BRKPT, "Break");
 
 out:
         set_fs(seg);
@@ -1054,7 +1061,7 @@ asmlinkage void do_tr(struct pt_regs *regs)
                         tcode = (opcode >> 6) & ((1 << 10) - 1);
         }
 
-        do_trap_or_bp(regs, tcode, "Trap");
+        do_trap_or_bp(regs, tcode, 0, "Trap");
 
 out:
         set_fs(seg);
@@ -1115,19 +1122,7 @@ no_r2_instr:
         if (unlikely(compute_return_epc(regs) < 0))
                 goto out;
 
-        if (get_isa16_mode(regs->cp0_epc)) {
-                unsigned short mmop[2] = { 0 };
-
-                if (unlikely(get_user(mmop[0], (u16 __user *)epc + 0) < 0))
-                        status = SIGSEGV;
-                if (unlikely(get_user(mmop[1], (u16 __user *)epc + 1) < 0))
-                        status = SIGSEGV;
-                opcode = mmop[0];
-                opcode = (opcode << 16) | mmop[1];
-
-                if (status < 0)
-                        status = simulate_rdhwr_mm(regs, opcode);
-        } else {
+        if (!get_isa16_mode(regs->cp0_epc)) {
                 if (unlikely(get_user(opcode, epc) < 0))
                         status = SIGSEGV;
 
@@ -1142,6 +1137,18 @@ no_r2_instr:
 
                 if (status < 0)
                         status = simulate_fp(regs, opcode, old_epc, old31);
+        } else if (cpu_has_mmips) {
+                unsigned short mmop[2] = { 0 };
+
+                if (unlikely(get_user(mmop[0], (u16 __user *)epc + 0) < 0))
+                        status = SIGSEGV;
+                if (unlikely(get_user(mmop[1], (u16 __user *)epc + 1) < 0))
+                        status = SIGSEGV;
+                opcode = mmop[0];
+                opcode = (opcode << 16) | mmop[1];
+
+                if (status < 0)
+                        status = simulate_rdhwr_mm(regs, opcode);
         }
 
         if (status < 0)
@@ -1492,6 +1499,7 @@ asmlinkage void do_mdmx(struct pt_regs *regs)
  */
 asmlinkage void do_watch(struct pt_regs *regs)
 {
+        siginfo_t info = { .si_signo = SIGTRAP, .si_code = TRAP_HWBKPT };
         enum ctx_state prev_state;
         u32 cause;
 
@@ -1512,7 +1520,7 @@ asmlinkage void do_watch(struct pt_regs *regs)
         if (test_tsk_thread_flag(current, TIF_LOAD_WATCH)) {
                 mips_read_watch_registers();
                 local_irq_enable();
-                force_sig(SIGTRAP, current);
+                force_sig_info(SIGTRAP, &info, current);
         } else {
                 mips_clear_watch_registers();
                 local_irq_enable();
@@ -2214,7 +2222,7 @@ void __init trap_init(void)
 
         /*
          * Copy the generic exception handlers to their final destination.
-         * This will be overriden later as suitable for a particular
+         * This will be overridden later as suitable for a particular
          * configuration.
          */
         set_handler(0x180, &except_vec3_generic, 0x80);