diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-19 02:12:00 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-19 02:12:00 +0200 |
| commit | ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f (patch) | |
| tree | e77b5ff0d17eb583312fe710de569081a3ec8f8d /arch/sh/kernel/cpu/sh2 | |
| parent | sh: Merge the _32/_64 variants of arch/sh/mm/Makefile. (diff) | |
| parent | sh: Prevent heartbeat from scribbling over non-LED bits. (diff) | |
| download | linux-ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f.tar.xz linux-ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f.zip | |
Merge branch 'master' into sh/cachetlb
Conflicts:
arch/sh/kernel/Makefile_64
Diffstat (limited to 'arch/sh/kernel/cpu/sh2')
| -rw-r--r-- | arch/sh/kernel/cpu/sh2/entry.S | 3 |
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 */ |