aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/include/asm/system.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-08-22 05:37:14 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-08-22 05:37:14 +0900
commitfa9d3b4da55fc8949efc2b4220d93f188fbcebd6 (patch)
treeead3e046b7e6e101d1d27db36116c52405d43c36 /arch/sh/include/asm/system.h
parentc01f0f1a4a96eb3acc5850e18cc43f24366966d0 (diff)
parent74db2479c1fecefd0a190f282f28f00565309807 (diff)
Merge branch 'sh/dwarf-unwinder'
Conflicts: arch/sh/kernel/cpu/sh3/entry.S
Diffstat (limited to 'arch/sh/include/asm/system.h')
-rw-r--r--arch/sh/include/asm/system.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/include/asm/system.h b/arch/sh/include/asm/system.h
index ab79e1f4fbe..f9e2ceb94d9 100644
--- a/arch/sh/include/asm/system.h
+++ b/arch/sh/include/asm/system.h
@@ -181,6 +181,11 @@ BUILD_TRAP_HANDLER(breakpoint);
BUILD_TRAP_HANDLER(singlestep);
BUILD_TRAP_HANDLER(fpu_error);
BUILD_TRAP_HANDLER(fpu_state_restore);
+BUILD_TRAP_HANDLER(unwinder);
+
+#ifdef CONFIG_BUG
+extern void handle_BUG(struct pt_regs *);
+#endif
#define arch_align_stack(x) (x)