diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-18 20:12:00 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-18 20:12:00 -0400 |
| commit | ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f (patch) | |
| tree | e77b5ff0d17eb583312fe710de569081a3ec8f8d /arch/sh/kernel/cpu/sh2 | |
| parent | 1b3edd9745ef3a9ee831fe5a611757686579c9e1 (diff) | |
| parent | e174d13010a6bd52045466bc35ca5a86e3f3ba9b (diff) | |
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) | |||
| 227 | mov.l @r15+, r14 | 227 | mov.l @r15+, r14 |
| 228 | add #8,r15 | 228 | add #8,r15 |
| 229 | lds.l @r15+, pr | 229 | lds.l @r15+, pr |
| 230 | mov.l @r15+,r15 | ||
| 230 | rte | 231 | rte |
| 231 | mov.l @r15+,r15 | 232 | nop |
| 232 | .align 2 | 233 | .align 2 |
| 233 | 1: .long gdb_vbr_vector | 234 | 1: .long gdb_vbr_vector |
| 234 | #endif /* CONFIG_SH_STANDARD_BIOS */ | 235 | #endif /* CONFIG_SH_STANDARD_BIOS */ |