Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / arch / mips / kernel / traps.c

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 3c906e723fd4243f103b9963cd7a8ef13bf2367f..77cff1f6d050cb92e21475ae52a9ef2f037b5bc5 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -202,19 +202,6 @@ void show_stack(struct task_struct *task, unsigned long *sp)
        show_stacktrace(task, &regs);
 }
 
-/*
- * The architecture-independent dump_stack generator
- */
-void dump_stack(void)
-{
-       struct pt_regs regs;
-
-       prepare_frametrace(&regs);
-       show_backtrace(current, &regs);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 static void show_code(unsigned int __user *pc)
 {
        long i;
@@ -240,7 +227,7 @@ static void __show_regs(const struct pt_regs *regs)
        unsigned int cause = regs->cp0_cause;
        int i;
 
-       printk("Cpu %d\n", smp_processor_id());
+       show_regs_print_info(KERN_DEFAULT);
 
        /*
         * Saved main processor registers