From a90993c693ab7bd72bcb28b105e8dd4f0698f836 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Wed, 4 Aug 2010 14:39:01 +0200 Subject: CRIS: Fixup lookup for delay slot faults Signed-off-by: Jesper Nilsson --- arch/cris/mm/fault.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3-70-g09d2