diff --git a/[refs] b/[refs]
index 41a7a710ba37..266f423c4f82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a6c7b6bbfefbe37dbbc31a209dbf0166ee51a07
+refs/heads/master: 6e7873f6ff38bca29bc65cb8c96fd7f557215755
diff --git a/trunk/arch/x86_64/lib/Makefile b/trunk/arch/x86_64/lib/Makefile
index 09c1ffa974a9..bbabad3c9335 100644
--- a/trunk/arch/x86_64/lib/Makefile
+++ b/trunk/arch/x86_64/lib/Makefile
@@ -10,4 +10,4 @@ obj-$(CONFIG_SMP)	+= msr-on-cpu.o
 lib-y := csum-partial_64.o csum-copy_64.o csum-wrappers_64.o delay_64.o \
 	usercopy_64.o getuser_64.o putuser_64.o  \
 	thunk_64.o clear_page_64.o copy_page_64.o bitstr_64.o bitops_64.o
-lib-y += memcpy_64.o memmove_64.o memset_64.o copy_user.o rwlock_64.o copy_user_nocache_64.o
+lib-y += memcpy_64.o memmove_64.o memset_64.o copy_user_64.o rwlock_64.o copy_user_nocache_64.o
diff --git a/trunk/arch/x86_64/lib/copy_user.S b/trunk/arch/x86_64/lib/copy_user_64.S
similarity index 100%
rename from trunk/arch/x86_64/lib/copy_user.S
rename to trunk/arch/x86_64/lib/copy_user_64.S