diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 59b16dcc5249..b865ce6e94f2 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -4,7 +4,7 @@
 
 extra-y 	:= head.o head64.o init_task.o vmlinux.lds
 EXTRA_AFLAGS	:= -traditional
-obj-y	:= process.o signal.o entry.o traps.o irq.o \
+obj-y	:= process.o signal.o entry.o traps_64.o irq.o \
 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
 		x8664_ksyms.o i387.o syscall.o vsyscall.o \
 		setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps_64.c
similarity index 100%
rename from arch/x86_64/kernel/traps.c
rename to arch/x86_64/kernel/traps_64.c