diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-06-14 01:18:51 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-14 01:18:51 -0400 |
commit | 5f857bce21cfd0531dc7d4daac74d976caf6166b (patch) | |
tree | 50894bfbbdf40744e1f224aedd562a73786adcbf /arch/sh/include/asm/bug.h | |
parent | 37c9ee0161332291c8d13bc40084d24c744ed842 (diff) |
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/asm/bug.h')
-rw-r--r-- | arch/sh/include/asm/bug.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/include/asm/bug.h b/arch/sh/include/asm/bug.h index 2b87d86bfc41..dcf278075429 100644 --- a/arch/sh/include/asm/bug.h +++ b/arch/sh/include/asm/bug.h | |||
@@ -110,6 +110,10 @@ do { \ | |||
110 | #include <asm-generic/bug.h> | 110 | #include <asm-generic/bug.h> |
111 | 111 | ||
112 | struct pt_regs; | 112 | struct pt_regs; |
113 | |||
114 | /* arch/sh/kernel/traps.c */ | ||
113 | extern void die(const char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn)); | 115 | extern void die(const char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn)); |
116 | extern void die_if_kernel(const char *str, struct pt_regs *regs, long err); | ||
117 | extern void die_if_no_fixup(const char *str, struct pt_regs *regs, long err); | ||
114 | 118 | ||
115 | #endif /* __ASM_SH_BUG_H */ | 119 | #endif /* __ASM_SH_BUG_H */ |