---

yaml --- r: 113568 b: refs/heads/master c: 8728861 h: refs/heads/master v: v3
git-mirror · Oct 13, 2008 · 2d3e183 · 2d3e183
1 parent a4a5c99
commit 2d3e183
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 1,072 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 081f75bbdc86de53537e1b5aca01de72bd2fea6b
+refs/heads/master: 8728861b4fead8119a1b7bb856a387320859cd98
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/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/trunk/arch/x86/kernel/traps_32.c → trunk/arch/x86/kernel/traps.c b/trunk/arch/x86/kernel/traps_32.c → trunk/arch/x86/kernel/traps.c