[MIPS] Check FCSR for pending interrupts, alternative version

[linux-2.6-omap-h63xx.git] / arch / mips / kernel / traps.c

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index f663c63d5dd31c4bd8049741d3c05735c912c801..18f56a9dbcfa487831e30d86dff1e4688d006634 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -229,6 +229,9 @@ void show_regs(struct pt_regs *regs)
                        printk("\n");
        }
 
+#ifdef CONFIG_CPU_HAS_SMARTMIPS
+       printk("Acx    : %0*lx\n", field, regs->acx);
+#endif
        printk("Hi    : %0*lx\n", field, regs->hi);
        printk("Lo    : %0*lx\n", field, regs->lo);
 
@@ -704,6 +707,7 @@ asmlinkage void do_bp(struct pt_regs *regs)
                die_if_kernel("Break instruction in kernel code", regs);
                force_sig(SIGTRAP, current);
        }
+       return;
 
 out_sigsegv:
        force_sig(SIGSEGV, current);
@@ -747,6 +751,7 @@ asmlinkage void do_tr(struct pt_regs *regs)
                die_if_kernel("Trap instruction in kernel code", regs);
                force_sig(SIGTRAP, current);
        }
+       return;
 
 out_sigsegv:
        force_sig(SIGSEGV, current);