Skip to content

Commit

Permalink
sh: Make sure rte delay slots are nopped out on all parts.
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Paul Mundt committed Aug 14, 2009
1 parent 606b4c9 commit 7a90e00
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion arch/sh/kernel/cpu/sh2/entry.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
3 changes: 2 additions & 1 deletion arch/sh/kernel/cpu/sh2a/entry.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,9 @@ ENTRY(sh_bios_handler)
movml.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 */
Expand Down

0 comments on commit 7a90e00

Please sign in to comment.