From b23ee90b9d639af3957b82eb84903dc6d1f21f4b Mon Sep 17 00:00:00 2001
From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Wed, 4 Aug 2010 14:39:01 +0200
Subject: [PATCH] --- yaml --- r: 207156 b: refs/heads/master c:
 a90993c693ab7bd72bcb28b105e8dd4f0698f836 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/cris/mm/fault.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cd4814d74528..6416a3b2b02a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c8a25b544c1659ad57de2394006fdd449325161
+refs/heads/master: a90993c693ab7bd72bcb28b105e8dd4f0698f836
diff --git a/trunk/arch/cris/mm/fault.c b/trunk/arch/cris/mm/fault.c
index 52b32b092603..72dbdbf0accf 100644
--- a/trunk/arch/cris/mm/fault.c
+++ b/trunk/arch/cris/mm/fault.c
@@ -334,8 +334,11 @@ int
 find_fixup_code(struct pt_regs *regs)
 {
 	const struct exception_table_entry *fixup;
+	/* in case of delay slot fault (v32) */
+	unsigned long ip = (instruction_pointer(regs) & ~0x1);
 
-	if ((fixup = search_exception_tables(instruction_pointer(regs))) != 0) {
+	fixup = search_exception_tables(ip);
+	if (fixup != 0) {
 		/* Adjust the instruction pointer in the stackframe. */
 		instruction_pointer(regs) = fixup->fixup;
 		arch_fixup(regs);