summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2010-08-04 14:39:01 +0200
committerJesper Nilsson <jesper.nilsson@axis.com>2010-08-04 18:28:47 +0200
commita90993c693ab7bd72bcb28b105e8dd4f0698f836 (patch)
tree577445c5e7b4102044a6b3b8293d47a94a2f03a8 /arch/cris
parent7c8a25b544c1659ad57de2394006fdd449325161 (diff)
downloadlinux-a90993c693ab7bd72bcb28b105e8dd4f0698f836.tar.bz2
CRIS: Fixup lookup for delay slot faults
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/mm/fault.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 52b32b092603..72dbdbf0accf 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);