MIPS: Set trap_no field in thread_struct on exception.

[linux-drm-fsl-dcu.git] / arch / mips / kernel / traps.c

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index da0b3189fe88350304f24eaee6db8f35a0545a28..cea964daf400644404e28d0f44477ecd86a94c8d 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -370,11 +370,6 @@ void show_registers(struct pt_regs *regs)
        set_fs(old_fs);
 }
 
        set_fs(old_fs);
 }
 

-static int regs_to_trapnr(struct pt_regs *regs)
-{
-       return (regs->cp0_cause >> 2) & 0x1f;
-}
-

 static DEFINE_RAW_SPINLOCK(die_lock);
 
 void __noreturn die(const char *str, struct pt_regs *regs)
 static DEFINE_RAW_SPINLOCK(die_lock);
 
 void __noreturn die(const char *str, struct pt_regs *regs)


@@ -384,7 +379,7 @@ void __noreturn die(const char *str, struct pt_regs *regs)
 
        oops_enter();
 
 
        oops_enter();
 

-       if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs),
+       if (notify_die(DIE_OOPS, str, regs, 0, current->thread.trap_nr,

                       SIGSEGV) == NOTIFY_STOP)
                sig = 0;
 
                       SIGSEGV) == NOTIFY_STOP)
                sig = 0;
 


@@ -470,7 +465,7 @@ asmlinkage void do_be(struct pt_regs *regs)
        printk(KERN_ALERT "%s bus error, epc == %0*lx, ra == %0*lx\n",
               data ? "Data" : "Instruction",
               field, regs->cp0_epc, field, regs->regs[31]);
        printk(KERN_ALERT "%s bus error, epc == %0*lx, ra == %0*lx\n",
               data ? "Data" : "Instruction",
               field, regs->cp0_epc, field, regs->regs[31]);

-       if (notify_die(DIE_OOPS, "bus error", regs, 0, regs_to_trapnr(regs),
+       if (notify_die(DIE_OOPS, "bus error", regs, 0, current->thread.trap_nr,

                       SIGBUS) == NOTIFY_STOP)
                goto out;
 
                       SIGBUS) == NOTIFY_STOP)
                goto out;
 


@@ -826,7 +821,7 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
        int sig;
 
        prev_state = exception_enter();
        int sig;
 
        prev_state = exception_enter();

-       if (notify_die(DIE_FP, "FP exception", regs, 0, regs_to_trapnr(regs),
+       if (notify_die(DIE_FP, "FP exception", regs, 0, current->thread.trap_nr,

                       SIGFPE) == NOTIFY_STOP)
                goto out;
 
                       SIGFPE) == NOTIFY_STOP)
                goto out;
 


@@ -882,11 +877,12 @@ void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
        char b[40];
 
 #ifdef CONFIG_KGDB_LOW_LEVEL_TRAP
        char b[40];
 
 #ifdef CONFIG_KGDB_LOW_LEVEL_TRAP

-       if (kgdb_ll_trap(DIE_TRAP, str, regs, code, regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP)
+       if (kgdb_ll_trap(DIE_TRAP, str, regs, code, current->thread.trap_nr,
+                        SIGTRAP) == NOTIFY_STOP)

                return;
 #endif /* CONFIG_KGDB_LOW_LEVEL_TRAP */
 
                return;
 #endif /* CONFIG_KGDB_LOW_LEVEL_TRAP */
 

-       if (notify_die(DIE_TRAP, str, regs, code, regs_to_trapnr(regs),
+       if (notify_die(DIE_TRAP, str, regs, code, current->thread.trap_nr,

                       SIGTRAP) == NOTIFY_STOP)
                return;
 
                       SIGTRAP) == NOTIFY_STOP)
                return;
 


@@ -948,6 +944,7 @@ asmlinkage void do_bp(struct pt_regs *regs)
                set_fs(KERNEL_DS);
 
        prev_state = exception_enter();
                set_fs(KERNEL_DS);
 
        prev_state = exception_enter();

+       current->thread.trap_nr = (regs->cp0_cause >> 2) & 0x1f;

        if (get_isa16_mode(regs->cp0_epc)) {
                u16 instr[2];
 
        if (get_isa16_mode(regs->cp0_epc)) {
                u16 instr[2];
 


@@ -989,13 +986,13 @@ asmlinkage void do_bp(struct pt_regs *regs)
        switch (bcode) {
        case BRK_KPROBE_BP:
                if (notify_die(DIE_BREAK, "debug", regs, bcode,
        switch (bcode) {
        case BRK_KPROBE_BP:
                if (notify_die(DIE_BREAK, "debug", regs, bcode,

-                              regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP)
+                              current->thread.trap_nr, SIGTRAP) == NOTIFY_STOP)

                        goto out;
                else
                        break;
        case BRK_KPROBE_SSTEPBP:
                if (notify_die(DIE_SSTEPBP, "single_step", regs, bcode,
                        goto out;
                else
                        break;
        case BRK_KPROBE_SSTEPBP:
                if (notify_die(DIE_SSTEPBP, "single_step", regs, bcode,

-                              regs_to_trapnr(regs), SIGTRAP) == NOTIFY_STOP)
+                              current->thread.trap_nr, SIGTRAP) == NOTIFY_STOP)

                        goto out;
                else
                        break;
                        goto out;
                else
                        break;


@@ -1028,6 +1025,7 @@ asmlinkage void do_tr(struct pt_regs *regs)
                set_fs(get_ds());
 
        prev_state = exception_enter();
                set_fs(get_ds());
 
        prev_state = exception_enter();

+       current->thread.trap_nr = (regs->cp0_cause >> 2) & 0x1f;

        if (get_isa16_mode(regs->cp0_epc)) {
                if (__get_user(instr[0], (u16 __user *)(epc + 0)) ||
                    __get_user(instr[1], (u16 __user *)(epc + 2)))
        if (get_isa16_mode(regs->cp0_epc)) {
                if (__get_user(instr[0], (u16 __user *)(epc + 0)) ||
                    __get_user(instr[1], (u16 __user *)(epc + 2)))


@@ -1094,8 +1092,9 @@ asmlinkage void do_ri(struct pt_regs *regs)
 no_r2_instr:
 
        prev_state = exception_enter();
 no_r2_instr:
 
        prev_state = exception_enter();

+       current->thread.trap_nr = (regs->cp0_cause >> 2) & 0x1f;

 
 

-       if (notify_die(DIE_RI, "RI Fault", regs, 0, regs_to_trapnr(regs),
+       if (notify_die(DIE_RI, "RI Fault", regs, 0, current->thread.trap_nr,

                       SIGILL) == NOTIFY_STOP)
                goto out;
 
                       SIGILL) == NOTIFY_STOP)
                goto out;
 


@@ -1444,8 +1443,9 @@ asmlinkage void do_msa_fpe(struct pt_regs *regs, unsigned int msacsr)
        enum ctx_state prev_state;
 
        prev_state = exception_enter();
        enum ctx_state prev_state;
 
        prev_state = exception_enter();

+       current->thread.trap_nr = (regs->cp0_cause >> 2) & 0x1f;

        if (notify_die(DIE_MSAFP, "MSA FP exception", regs, 0,
        if (notify_die(DIE_MSAFP, "MSA FP exception", regs, 0,

-                      regs_to_trapnr(regs), SIGFPE) == NOTIFY_STOP)
+                      current->thread.trap_nr, SIGFPE) == NOTIFY_STOP)

                goto out;
 
        /* Clear MSACSR.Cause before enabling interrupts */
                goto out;
 
        /* Clear MSACSR.Cause before enabling interrupts */