CRIS: Fixup lookup for delay slot faults

Signed-off-by: Jesper Nilsson <[email protected]>
Baughn · Aug 4, 2010 · a90993c · a90993c
1 parent 7c8a25b
commit a90993c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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);