From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Wed, 4 Aug 2010 12:39:01 +0000 (+0200)
Subject: CRIS: Fixup lookup for delay slot faults
X-Git-Tag: v2.6.36-rc1~484^2~4
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=a90993c693ab7bd72bcb28b105e8dd4f0698f836;p=net-next-2.6.git

CRIS: Fixup lookup for delay slot faults

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
---

diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 52b32b09260..72dbdbf0acc 100644
--- a/arch/cris/mm/fault.c
+++ b/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);