From 1983c9cb89f8bc1f088b95ca57c805140f476cc3 Mon Sep 17 00:00:00 2001
From: Robin Getz <robin.getz@analog.com>
Date: Mon, 12 Nov 2007 22:46:46 +0800
Subject: [PATCH] --- yaml --- r: 74092 b: refs/heads/master c:
 4a589e1ef67fdb2d5fa783117da8dc7cba576af4 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/blackfin/kernel/traps.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3b04cfd62f54..84be4ebee40b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f26fbc48f130962fce15f37d079968f0f272e0c2
+refs/heads/master: 4a589e1ef67fdb2d5fa783117da8dc7cba576af4
diff --git a/trunk/arch/blackfin/kernel/traps.c b/trunk/arch/blackfin/kernel/traps.c
index aaddb724a5fb..ce9981b5339b 100644
--- a/trunk/arch/blackfin/kernel/traps.c
+++ b/trunk/arch/blackfin/kernel/traps.c
@@ -158,7 +158,7 @@ static void decode_address(char *buf, unsigned long address)
 	}
 
 	/* we were unable to find this address anywhere */
-	sprintf(buf, "[<0x%p>]", (void *)address);
+	sprintf(buf, "<0x%p> /* unknown address */", (void *)address);
 
 done:
 	write_unlock_irqrestore(&tasklist_lock, flags);
@@ -467,7 +467,8 @@ asmlinkage void trap_c(struct pt_regs *fp)
 		/* Ensure that bad return addresses don't end up in an infinite
 		 * loop, due to speculative loads/reads
 		 */
-		fp->pc = SAFE_USER_INSTRUCTION;
+		if (trapnr == VEC_CPLB_I_M)
+			fp->pc = SAFE_USER_INSTRUCTION;
 	}
 	info.si_signo = sig;
 	info.si_errno = 0;