diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 18:02:59 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 18:02:59 +0900 |
| commit | 0858d9c0c591ce9baa1baf72eaf6f67823f3bc25 (patch) | |
| tree | 1ea697a8e34ff1784572db22bcb5c9da7bbfb40c /arch/sh/kernel/cpu/sh2a/entry.S | |
| parent | 9d7302299ee96ca954fe4ab8ca640333b6e19ad0 (diff) | |
| parent | 963e04cafbf001ec431025a46ec246ae6d89daba (diff) | |
Merge branch 'sh/hwblk' into sh/pm-runtime
Diffstat (limited to 'arch/sh/kernel/cpu/sh2a/entry.S')
| -rw-r--r-- | arch/sh/kernel/cpu/sh2a/entry.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh2a/entry.S b/arch/sh/kernel/cpu/sh2a/entry.S index ab3903eeda5..222742ddc0d 100644 --- a/arch/sh/kernel/cpu/sh2a/entry.S +++ b/arch/sh/kernel/cpu/sh2a/entry.S @@ -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 */ |