From 49c6450e02978d6e5c1fe10cb4575c10c0e45925 Mon Sep 17 00:00:00 2001
From: Scott Wood <scottwood@freescale.com>
Date: Fri, 28 Sep 2007 04:38:55 +1000
Subject: [PATCH] --- yaml --- r: 67412 b: refs/heads/master c:
 0de2d820067e03ca93f6bf5320d362d5262fb7a3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index db1b1d32f99c..b5a697f4dc2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eb523b939d59fd90518188750c26df5d357478f
+refs/heads/master: 0de2d820067e03ca93f6bf5320d362d5262fb7a3
diff --git a/trunk/arch/powerpc/kernel/process.c b/trunk/arch/powerpc/kernel/process.c
index 57c589c34147..588c0cb8115e 100644
--- a/trunk/arch/powerpc/kernel/process.c
+++ b/trunk/arch/powerpc/kernel/process.c
@@ -354,6 +354,14 @@ static void show_instructions(struct pt_regs *regs)
 		if (!(i % 8))
 			printk("\n");
 
+#if !defined(CONFIG_BOOKE)
+		/* If executing with the IMMU off, adjust pc rather
+		 * than print XXXXXXXX.
+		 */
+		if (!(regs->msr & MSR_IR))
+			pc = (unsigned long)phys_to_virt(pc);
+#endif
+
 		/* We use __get_user here *only* to avoid an OOPS on a
 		 * bad address because the pc *should* only be a
 		 * kernel address.