summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:11:47 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:11:47 +0200
commit311d64ab6dab57a4e8b012aa0da0240cf1c167e4 (patch)
tree39f16b665d01cc2c7de6de5c1b34fbd72331e0c2
parentb673187cba8a5bcd28455b8540d8542df1d85d9b (diff)
downloadlinux-311d64ab6dab57a4e8b012aa0da0240cf1c167e4.tar.bz2
i386: prepare shared kernel/traps.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/i386/kernel/Makefile2
-rw-r--r--arch/i386/kernel/traps_32.c (renamed from arch/i386/kernel/traps.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 9d33b00de659..bd44e20d2cd9 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -4,7 +4,7 @@
extra-y := head.o init_task.o vmlinux.lds
-obj-y := process.o signal.o entry.o traps.o irq.o \
+obj-y := process.o signal.o entry.o traps_32.o irq.o \
ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
pci-dma.o i386_ksyms.o i387.o bootflag.o e820.o\
quirks.o i8237.o topology.o alternative.o i8253.o tsc.o
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps_32.c
index 47b0bef335bd..47b0bef335bd 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps_32.c