diff --git a/[refs] b/[refs]
index 0a88cfd1099f..9683c91ad7bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a60b778b5a813c6b3663db9244f5a886f0f91027
+refs/heads/master: cde82b404831aecccf2a1828b2dc643e0ac0e7ce
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 1f82d76447d6..f502c141c1df 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -31,7 +31,7 @@ obj-$(CONFIG_X86_NUMAQ)		+= numaq.o
 obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_MODULES)		+= module_32.o
-obj-y				+= sysenter.o vsyscall.o
+obj-y				+= sysenter.o vsyscall_32.o
 obj-$(CONFIG_ACPI_SRAT) 	+= srat_32.o
 obj-$(CONFIG_EFI) 		+= efi_32.o efi_stub_32.o
 obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o
@@ -47,10 +47,10 @@ obj-y				+= pcspeaker.o
 
 obj-$(CONFIG_SCx200)		+= scx200.o
 
-# vsyscall.o contains the vsyscall DSO images as __initdata.
+# vsyscall_32.o contains the vsyscall DSO images as __initdata.
 # We must build both images before we can assemble it.
 # Note: kbuild does not track this dependency due to usage of .incbin
-$(obj)/vsyscall.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so
+$(obj)/vsyscall_32.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so
 targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
 targets += vsyscall-note.o vsyscall_32.lds
 
diff --git a/trunk/arch/i386/kernel/vsyscall.S b/trunk/arch/i386/kernel/vsyscall_32.S
similarity index 100%
rename from trunk/arch/i386/kernel/vsyscall.S
rename to trunk/arch/i386/kernel/vsyscall_32.S