diff options
| author | Phil Edworthy <Phil.Edworthy@renesas.com> | 2011-08-22 15:56:08 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 15:32:04 +0900 |
| commit | 0710b91c516ffd448db6e80e9026f11778a80d45 (patch) | |
| tree | ecb5955e09895f775ed7d6e38ee38facb87c1ff2 /arch | |
| parent | 2d0b579a9831c927bcebf5f61055e7462f0af2dc (diff) | |
| download | linux-3.10-0710b91c516ffd448db6e80e9026f11778a80d45.tar.gz linux-3.10-0710b91c516ffd448db6e80e9026f11778a80d45.tar.bz2 linux-3.10-0710b91c516ffd448db6e80e9026f11778a80d45.zip | |
sh: Fix unaligned memory access for branches without delay slots
This patch just clears the return code for those cases where an
unaligned memory access occurs on branch instructions without a
delay slot.
Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/kernel/traps_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c index d9006f8ffc1..61fa4a5bc72 100644 --- a/arch/sh/kernel/traps_32.c +++ b/arch/sh/kernel/traps_32.c @@ -466,6 +466,7 @@ int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs, case 0x0500: /* mov.w @(disp,Rm),R0 */ goto simple; case 0x0B00: /* bf lab - no delayslot*/ + ret = 0; break; case 0x0F00: /* bf/s lab */ ret = handle_delayslot(regs, instruction, ma); @@ -479,6 +480,7 @@ int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs, } break; case 0x0900: /* bt lab - no delayslot */ + ret = 0; break; case 0x0D00: /* bt/s lab */ ret = handle_delayslot(regs, instruction, ma); |