lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: Make sure rte delay slots are nopped out on all parts.

Browse Source 
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>
This commit is contained in:
Paul Mundt
2009-08-15 07:41:45 +09:00
parent 606b4c992f
commit 7a90e00dda
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sh/kernel/cpu/sh2/entry.S
View File

@@ -227,8 +227,9 @@ ENTRY(sh_bios_handler)
mov.l @r15+, r14 mov.l @r15+, r14
add #8,r15 add #8,r15
lds.l @r15+, pr lds.l @r15+, pr
mov.l @r15+,r15
rte rte
mov.l @r15+,r15 nop
.align 2 .align 2
1: .long gdb_vbr_vector 1: .long gdb_vbr_vector
#endif /* CONFIG_SH_STANDARD_BIOS */ #endif /* CONFIG_SH_STANDARD_BIOS */

3
arch/sh/kernel/cpu/sh2a/entry.S
View File

@@ -176,8 +176,9 @@ ENTRY(sh_bios_handler)
movml.l @r15+,r14 movml.l @r15+,r14
add #8,r15 add #8,r15
lds.l @r15+, pr lds.l @r15+, pr
mov.l @r15+,r15
rte rte
mov.l @r15+,r15 nop
.align 2 .align 2
1: .long gdb_vbr_vector 1: .long gdb_vbr_vector
#endif /* CONFIG_SH_STANDARD_BIOS */ #endif /* CONFIG_SH_STANDARD_BIOS */