summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-07-26 00:46:15 -0500
committerKumar Gala <galak@kernel.crashing.org>2007-07-26 00:46:15 -0500
commit141707892e92dca69b7b8af65b9367da2d1f8120 (patch)
tree3dabe75992ddd0735657e65af8558e851073d8b1 /arch/powerpc
parentd1c813123f3beebcffb8446929e0e917defda67f (diff)
downloadlinux-141707892e92dca69b7b8af65b9367da2d1f8120.tar.gz
linux-141707892e92dca69b7b8af65b9367da2d1f8120.tar.bz2
linux-141707892e92dca69b7b8af65b9367da2d1f8120.zip
[POWERPC] Fix register labels on show_regs() message for 4xx/Book-E
In a show_regs() message The DEAR and ESR were reported as DAR and DSISR which only exist on classic parts. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/process.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 84f000a45e36..a83727b308a0 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -423,7 +423,11 @@ void show_regs(struct pt_regs * regs)
printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer);
trap = TRAP(regs);
if (trap == 0x300 || trap == 0x600)
+#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
+ printk("DEAR: "REG", ESR: "REG"\n", regs->dar, regs->dsisr);
+#else
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
+#endif
printk("TASK = %p[%d] '%s' THREAD: %p",
current, current->pid, current->comm, task_thread_info(current));