aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/cpu/sh2/entry.S
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-08-15 07:41:45 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-08-15 07:41:45 +0900
commit7a90e00dda0bae66b5232d5a37155f13a0581369 (patch)
treee130138a736823a84450c9eff6ff8e8b85940e39 /arch/sh/kernel/cpu/sh2/entry.S
parentsh: stacktrace: Properly terminate the trace entry buffer. (diff)
downloadlinux-dev-7a90e00dda0bae66b5232d5a37155f13a0581369.tar.xz
linux-dev-7a90e00dda0bae66b5232d5a37155f13a0581369.zip
sh: Make sure rte delay slots are nopped out on all parts.
Future SH parts do not support any instruction but a nop in the rte delay slot, so make the change for all offending parts. SH-5 is excluded from this, and already has its own set of restrictions with regards to rte delay slot handling. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh2/entry.S')
-rw-r--r--arch/sh/kernel/cpu/sh2/entry.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S
index becc54c45692..c8a4331d9b8d 100644
--- a/arch/sh/kernel/cpu/sh2/entry.S
+++ b/arch/sh/kernel/cpu/sh2/entry.S
@@ -227,8 +227,9 @@ ENTRY(sh_bios_handler)
mov.l @r15+, r14
add #8,r15
lds.l @r15+, pr
+ mov.l @r15+,r15
rte
- mov.l @r15+,r15
+ nop
.align 2
1: .long gdb_vbr_vector
#endif /* CONFIG_SH_STANDARD_BIOS */