projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sh: Share bug/debug traps across _32 and _64.
[powerpc.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh2
/
entry.S
diff --git
a/arch/sh/kernel/cpu/sh2/entry.S
b/arch/sh/kernel/cpu/sh2/entry.S
index
c16dc8f
..
4ff2334
100644
(file)
--- a/
arch/sh/kernel/cpu/sh2/entry.S
+++ b/
arch/sh/kernel/cpu/sh2/entry.S
@@
-250,7
+250,7
@@
ENTRY(sh_bios_handler)
1: .long gdb_vbr_vector
#endif /* CONFIG_SH_STANDARD_BIOS */
1: .long gdb_vbr_vector
#endif /* CONFIG_SH_STANDARD_BIOS */
-ENTRY(address_error_handler)
+ENTRY(address_error_
trap_
handler)
mov r15,r4 ! regs
add #4,r4
mov #OFF_PC,r0
mov r15,r4 ! regs
add #4,r4
mov #OFF_PC,r0
@@
-311,6
+311,7
@@
restore_all:
rte
nop
rte
nop
+ .align 2
#ifdef CONFIG_TRACE_IRQFLAGS
1: .long trace_hardirqs_off
#endif
#ifdef CONFIG_TRACE_IRQFLAGS
1: .long trace_hardirqs_off
#endif