Merge branch 'fixes-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

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));