summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/traps_64.c
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/kernel/traps_64.c
parent37c9ee0161332291c8d13bc40084d24c744ed842 (diff)
downloadlinux-stable-5f857bce21cfd0531dc7d4daac74d976caf6166b.tar.gz
linux-stable-5f857bce21cfd0531dc7d4daac74d976caf6166b.tar.bz2
linux-stable-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/kernel/traps_64.c')
-rw-r--r--arch/sh/kernel/traps_64.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c
index c902c29400a3..75bef61892d2 100644
--- a/arch/sh/kernel/traps_64.c
+++ b/arch/sh/kernel/traps_64.c
@@ -41,37 +41,6 @@ asmlinkage void do_##name(unsigned long error_code, struct pt_regs *regs) \
do_unhandled_exception(trapnr, signr, str, __stringify(name), error_code, regs, current); \
}
-static DEFINE_SPINLOCK(die_lock);
-
-void die(const char * str, struct pt_regs * regs, long err)
-{
- console_verbose();
- spin_lock_irq(&die_lock);
- printk("%s: %lx\n", str, (err & 0xffffff));
- show_regs(regs);
- spin_unlock_irq(&die_lock);
- do_exit(SIGSEGV);
-}
-
-static inline void die_if_kernel(const char * str, struct pt_regs * regs, long err)
-{
- if (!user_mode(regs))
- die(str, regs, err);
-}
-
-static void die_if_no_fixup(const char * str, struct pt_regs * regs, long err)
-{
- if (!user_mode(regs)) {
- const struct exception_table_entry *fixup;
- fixup = search_exception_tables(regs->pc);
- if (fixup) {
- regs->pc = fixup->fixup;
- return;
- }
- die(str, regs, err);
- }
-}
-
DO_ERROR(13, SIGILL, "illegal slot instruction", illegal_slot_inst, current)
DO_ERROR(87, SIGSEGV, "address error (exec)", address_error_exec, current)