Merge tag 'nfs-for-3.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

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

diff --git a/arch/score/kernel/traps.c b/arch/score/kernel/traps.c
index 0e46fb19a8481e16b30752556a72954f74edc41c..1517a7dcd6d92a3e49ec9f847456de3156267bfe 100644 (file)
--- a/arch/score/kernel/traps.c
+++ b/arch/score/kernel/traps.c
@@ -117,6 +117,8 @@ static void show_code(unsigned int *pc)
  */
 void show_regs(struct pt_regs *regs)
 {
+       show_regs_print_info(KERN_DEFAULT);
+
        printk("r0 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
                regs->regs[0], regs->regs[1], regs->regs[2], regs->regs[3],
                regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]);
@@ -149,16 +151,6 @@ static void show_registers(struct pt_regs *regs)
        printk(KERN_NOTICE "\n");
 }
 
-/*
- * The architecture-independent dump_stack generator
- */
-void dump_stack(void)
-{
-       show_stack(current_thread_info()->task,
-                  (long *) get_irq_regs()->regs[0]);
-}
-EXPORT_SYMBOL(dump_stack);
-
 void __die(const char *str, struct pt_regs *regs, const char *file,
        const char *func, unsigned long line)
 {