diff --git a/[refs] b/[refs]
index 6265f9833cff..a687583d7659 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4f127b931e66aeb4740d2cff36bc2e893af427e
+refs/heads/master: 930eed490ca02aaad6aa1bd10614a2b70cf621c6
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 1efdb4714981..0af9b0c11cb8 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -29,7 +29,7 @@ obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel_32.o crash_32.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_32.o
 obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o
 obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit_32.o
-obj-$(CONFIG_KPROBES)		+= kprobes.o
+obj-$(CONFIG_KPROBES)		+= kprobes_32.o
 obj-$(CONFIG_MODULES)		+= module_32.o
 obj-y				+= sysenter_32.o vsyscall_32.o
 obj-$(CONFIG_ACPI_SRAT) 	+= srat_32.o
diff --git a/trunk/arch/i386/kernel/kprobes.c b/trunk/arch/i386/kernel/kprobes_32.c
similarity index 100%
rename from trunk/arch/i386/kernel/kprobes.c
rename to trunk/arch/i386/kernel/kprobes_32.c