Commit 2f75fbf1 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Move in the SH-5 traps.c impl. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 781c63e6

arch/sh/kernel/Makefile_32

+1 −1
Original line number Diff line number Diff line
@@ -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/

arch/sh/kernel/Makefile_64

+1 −1
Original line number Diff line number Diff line
@@ -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/

arch/sh/kernel/traps.c→arch/sh/kernel/traps_32.c

+0 −0

File moved.

View file

arch/sh64/kernel/traps.c→arch/sh/kernel/traps_64.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

}