traps: x86: finalize unification of traps.c

traps_32.c and traps_64.c are now equal. Move one to traps.c, delete the other one and change the Makefile Signed-off-by: Alexander van Heukelum <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
mna · Oct 13, 2008 · 8728861 · 8728861
1 parent 081f75b
commit 8728861
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1,071 deletions.
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
@@ -23,7 +23,7 @@ CFLAGS_hpet.o		:= $(nostackp)
 CFLAGS_tsc.o		:= $(nostackp)
 
 obj-y			:= process_$(BITS).o signal_$(BITS).o entry_$(BITS).o
-obj-y			+= traps_$(BITS).o irq_$(BITS).o dumpstack_$(BITS).o
+obj-y			+= traps.o irq_$(BITS).o dumpstack_$(BITS).o
 obj-y			+= time_$(BITS).o ioport.o ldt.o
 obj-y			+= setup.o i8259.o irqinit_$(BITS).o setup_percpu.o
 obj-$(CONFIG_X86_VISWS)	+= visws_quirks.o

diff --git a/arch/x86/kernel/traps_32.c → arch/x86/kernel/traps.c b/arch/x86/kernel/traps_32.c → arch/x86/kernel/traps.c