aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/kernel/debugtraps.S
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-08-22 03:49:58 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-08-22 03:49:58 +0900
commitc153a58e715e16ffcd6c4b3da7fc6b4a556bf917 (patch)
tree89639b00047f341f5ebf0b2029a861e3718f641f /arch/sh/kernel/debugtraps.S
parent4ab8f241f6d510470c15b62ac10f6905ff5c97bd (diff)
parent5580e9044df9c0e87861739d8c527006ead92e52 (diff)
Merge branch 'sh/dwarf-unwinder' of git://github.com/mfleming/linux-2.6 into sh/dwarf-unwinder
Diffstat (limited to 'arch/sh/kernel/debugtraps.S')
-rw-r--r--arch/sh/kernel/debugtraps.S6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/sh/kernel/debugtraps.S b/arch/sh/kernel/debugtraps.S
index 591741383ee..cb00e4a82d4 100644
--- a/arch/sh/kernel/debugtraps.S
+++ b/arch/sh/kernel/debugtraps.S
@@ -21,6 +21,10 @@
#define sh_bios_handler debug_trap_handler
#endif
+#if !defined(CONFIG_DWARF_UNWINDER)
+#define unwinder_trap_handler debug_trap_handler
+#endif
+
.data
ENTRY(debug_trap_table)
@@ -35,7 +39,7 @@ ENTRY(debug_trap_table)
.long debug_trap_handler /* 0x38 */
.long debug_trap_handler /* 0x39 */
.long debug_trap_handler /* 0x3a */
- .long debug_trap_handler /* 0x3b */
+ .long unwinder_trap_handler /* 0x3b */
.long breakpoint_trap_handler /* 0x3c */
.long singlestep_trap_handler /* 0x3d */
.long bug_trap_handler /* 0x3e */