Merge branch 'sh/dwarf-unwinder' of git://github.com/mfleming/linux-2.6 into sh/dwarf-unwinder

1 files changed, 5 insertions, 1 deletions

diff --git a/arch/sh/kernel/debugtraps.S b/arch/sh/kernel/debugtraps.S
index 591741383ee6..cb00e4a82d4d 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 */