From 519a1660f21fd619c03dadffe0c9169757b833f8 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Thu, 14 Jul 2011 19:25:12 +0000
Subject: [PATCH] --- yaml --- r: 259166 b: refs/heads/master c:
 5115a026cebeb5537016497e78f4402e5d4ac54e h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/powerpc/kernel/process.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 79ad7736ebfe..05d9d831263d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 762e77ae7dd055d0b77e0ad34d87db7416df109e
+refs/heads/master: 5115a026cebeb5537016497e78f4402e5d4ac54e
diff --git a/trunk/arch/powerpc/kernel/process.c b/trunk/arch/powerpc/kernel/process.c
index 885a2dd2ab80..d1aa3f43a68c 100644
--- a/trunk/arch/powerpc/kernel/process.c
+++ b/trunk/arch/powerpc/kernel/process.c
@@ -650,6 +650,8 @@ void show_regs(struct pt_regs * regs)
 	printbits(regs->msr, msr_bits);
 	printk("  CR: %08lx  XER: %08lx\n", regs->ccr, regs->xer);
 	trap = TRAP(regs);
+	if ((regs->trap != 0xc00) && cpu_has_feature(CPU_FTR_CFAR))
+		printk("CFAR: "REG"\n", regs->orig_gpr3);
 	if (trap == 0x300 || trap == 0x600)
 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
 		printk("DEAR: "REG", ESR: "REG"\n", regs->dar, regs->dsisr);