diff --git a/[refs] b/[refs]
index dcfc886cbd40..9d1b765fc17e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4529a0f636cd77909fb1f10c25edc52a22950366
+refs/heads/master: 584d92415b5c4e93e2bc3d18756815758f2a1f07
diff --git a/trunk/arch/x86_64/lib/Makefile b/trunk/arch/x86_64/lib/Makefile
index 9212301b6427..7157801093af 100644
--- a/trunk/arch/x86_64/lib/Makefile
+++ b/trunk/arch/x86_64/lib/Makefile
@@ -8,6 +8,6 @@ obj-y := io.o iomap_copy_64.o
 obj-$(CONFIG_SMP)	+= msr-on-cpu.o
 
 lib-y := csum-partial.o csum-copy_64.o csum-wrappers_64.o delay.o \
-	usercopy.o getuser_64.o putuser.o  \
+	usercopy_64.o getuser_64.o putuser.o  \
 	thunk_64.o clear_page_64.o copy_page_64.o bitstr_64.o bitops.o
 lib-y += memcpy_64.o memmove_64.o memset.o copy_user.o rwlock_64.o copy_user_nocache_64.o
diff --git a/trunk/arch/x86_64/lib/usercopy.c b/trunk/arch/x86_64/lib/usercopy_64.c
similarity index 100%
rename from trunk/arch/x86_64/lib/usercopy.c
rename to trunk/arch/x86_64/lib/usercopy_64.c