From b64b42ce39d1e73be27193f0be26580c81c044c6 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Mon, 14 Apr 2008 11:20:59 +0100
Subject: [PATCH] --- yaml --- r: 88291 b: refs/heads/master c:
 4f3f8e94b7b079131f0faf641e8afd790a6537d1 h: refs/heads/master i:   88289:
 a4276e42d2b82593cb2edcda78f14a1074cdf851   88287:
 836461a74651c1d0fabc9918c1bf06ac1f8a7cf1 v: v3

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

diff --git a/[refs] b/[refs]
index 175683ae9e4e..7d197638ad75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 120dd64cacd4fb796bca0acba3665553f1d9ecaa
+refs/heads/master: 4f3f8e94b7b079131f0faf641e8afd790a6537d1
diff --git a/trunk/arch/frv/kernel/traps.c b/trunk/arch/frv/kernel/traps.c
index 2f7e66877f3b..7089c2428b3f 100644
--- a/trunk/arch/frv/kernel/traps.c
+++ b/trunk/arch/frv/kernel/traps.c
@@ -73,7 +73,7 @@ asmlinkage void illegal_instruction(unsigned long esfr1, unsigned long epcr0, un
 		      epcr0, esr0, esfr1);
 
 	info.si_errno	= 0;
-	info.si_addr	= (void *) ((epcr0 & EPCR0_PC) ? (epcr0 & EPCR0_PC) : __frame->pc);
+	info.si_addr	= (void *) ((epcr0 & EPCR0_V) ? (epcr0 & EPCR0_PC) : __frame->pc);
 
 	switch (__frame->tbr & TBR_TT) {
 	case TBR_TT_ILLEGAL_INSTR: