Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8728861b authored Oct 03, 2008 by Alexander van Heukelum Committed by Ingo Molnar Oct 13, 2008

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 <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 081f75bb

arch/x86/kernel/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

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

+0 −0

File moved.

arch/x86/kernel/traps_64.c

deleted100644 → 0

+0 −1070

File deleted.

Preview size limit exceeded, changes collapsed.