diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 32acb970f416..6175e370ee4a 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -100,7 +100,9 @@ obj-$(CONFIG_KEXEC_FILE)	+= kexec-bzimage64.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o
 obj-y				+= kprobes/
 obj-$(CONFIG_MODULES)		+= module.o
-obj-$(CONFIG_DOUBLEFAULT)	+= doublefault.o
+ifeq ($(CONFIG_X86_32),y)
+obj-$(CONFIG_DOUBLEFAULT)	+= doublefault_32.o
+endif
 obj-$(CONFIG_KGDB)		+= kgdb.o
 obj-$(CONFIG_VM86)		+= vm86_32.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault_32.c
similarity index 98%
rename from arch/x86/kernel/doublefault.c
rename to arch/x86/kernel/doublefault_32.c
index 0b3c616b61a3..61c707ca8a09 100644
--- a/arch/x86/kernel/doublefault.c
+++ b/arch/x86/kernel/doublefault_32.c
@@ -10,8 +10,6 @@
 #include <asm/processor.h>
 #include <asm/desc.h>
 
-#ifdef CONFIG_X86_32
-
 #define DOUBLEFAULT_STACKSIZE (1024)
 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
 #define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
@@ -71,5 +69,3 @@ struct x86_hw_tss doublefault_tss __cacheline_aligned = {
 
 	.__cr3		= __pa_nodebug(swapper_pg_dir),
 };
-
-#endif