diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-11-10 20:14:15 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-28 13:18:43 +0900 |
| commit | 2f75fbf16bd87f36f3e72396b603bc6689e04be4 (patch) | |
| tree | 2796bb99acee702df81fa2424224d608098e2673 | |
| parent | 781c63e68ddc37f2fb5eed9b44b3075cd2b3ced3 (diff) | |
sh: Move in the SH-5 traps.c impl.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/kernel/Makefile_32 | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/Makefile_64 | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/traps_32.c (renamed from arch/sh/kernel/traps.c) | 0 | ||||
| -rw-r--r-- | arch/sh/kernel/traps_64.c (renamed from arch/sh64/kernel/traps.c) | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32 index bad6bf5ac478..29b44eb3b934 100644 --- a/arch/sh/kernel/Makefile_32 +++ b/arch/sh/kernel/Makefile_32 @@ -6,7 +6,7 @@ extra-y := head.o init_task.o vmlinux.lds obj-y := debugtraps.o io.o io_generic.o irq.o machvec.o process_32.o \ ptrace_32.o semaphore.o setup.o signal_32.o sys_sh.o syscalls.o \ - time.o topology.o traps.o + time.o topology.o traps_32.o obj-y += cpu/ timers/ obj-$(CONFIG_VSYSCALL) += vsyscall/ diff --git a/arch/sh/kernel/Makefile_64 b/arch/sh/kernel/Makefile_64 index 1f27d5fd99a8..fb87d642d1c1 100644 --- a/arch/sh/kernel/Makefile_64 +++ b/arch/sh/kernel/Makefile_64 @@ -2,7 +2,7 @@ extra-y := head.o init_task.o vmlinux.lds obj-y := debugtraps.o io.o io_generic.o irq.o machvec.o process_64.o \ ptrace_64.o semaphore.o setup.o signal_64.o sys_sh64.o syscalls.o \ - time.o topology.o traps.o + time.o topology.o traps_64.o obj-y += cpu/ timers/ obj-$(CONFIG_VSYSCALL) += vsyscall/ diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps_32.c index cf99111cb33f..cf99111cb33f 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps_32.c diff --git a/arch/sh64/kernel/traps.c b/arch/sh/kernel/traps_64.c index f32df3831f45..742ce18b6820 100644 --- a/arch/sh64/kernel/traps.c +++ b/arch/sh/kernel/traps_64.c @@ -244,7 +244,6 @@ DO_ERROR(12, SIGILL, "reserved instruction", reserved_inst, current) /* Called with interrupts disabled */ asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs) { - PLS(); show_excp_regs(__FUNCTION__, -1, -1, regs); die_if_kernel("exception", regs, ex); } |