summaryrefslogtreecommitdiff
path: root/arch/sh/include
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-06-14 14:18:51 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-06-14 14:18:51 +0900
commit5f857bce21cfd0531dc7d4daac74d976caf6166b (patch)
tree50894bfbbdf40744e1f224aedd562a73786adcbf /arch/sh/include
parent37c9ee0161332291c8d13bc40084d24c744ed842 (diff)
downloadlinux-3.10-5f857bce21cfd0531dc7d4daac74d976caf6166b.tar.gz
linux-3.10-5f857bce21cfd0531dc7d4daac74d976caf6166b.tar.bz2
linux-3.10-5f857bce21cfd0531dc7d4daac74d976caf6166b.zip
sh: Consolidate die definitions for trap handlers.
This kills off the _64 versions and consolidates on the more robust _32 versions instead. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include')
-rw-r--r--arch/sh/include/asm/bug.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/include/asm/bug.h b/arch/sh/include/asm/bug.h
index 2b87d86bfc4..dcf27807542 100644
--- a/arch/sh/include/asm/bug.h
+++ b/arch/sh/include/asm/bug.h
@@ -110,6 +110,10 @@ do { \
#include <asm-generic/bug.h>
struct pt_regs;
+
+/* arch/sh/kernel/traps.c */
extern void die(const char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn));
+extern void die_if_kernel(const char *str, struct pt_regs *regs, long err);
+extern void die_if_no_fixup(const char *str, struct pt_regs *regs, long err);
#endif /* __ASM_SH_BUG_H */