diff --git a/[refs] b/[refs]
index 804bba42b417..aa423a718b0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 201c943463f9581ed7aac02db5ab6bc3091f5c03
+refs/heads/master: 7d96027379c0f43f7169019c814cadca7487d507
diff --git a/trunk/arch/x86_64/lib/Makefile b/trunk/arch/x86_64/lib/Makefile
index ea20b1077ff0..c22087f66d5f 100644
--- a/trunk/arch/x86_64/lib/Makefile
+++ b/trunk/arch/x86_64/lib/Makefile
@@ -9,5 +9,5 @@ obj-$(CONFIG_SMP)	+= msr-on-cpu.o
 
 lib-y := csum-partial.o csum-copy.o csum-wrappers.o delay.o \
 	usercopy.o getuser.o putuser.o  \
-	thunk_64.o clear_page.o copy_page.o bitstr.o bitops.o
+	thunk_64.o clear_page.o copy_page_64.o bitstr.o bitops.o
 lib-y += memcpy.o memmove.o memset.o copy_user.o rwlock.o copy_user_nocache.o
diff --git a/trunk/arch/x86_64/lib/copy_page.S b/trunk/arch/x86_64/lib/copy_page_64.S
similarity index 100%
rename from trunk/arch/x86_64/lib/copy_page.S
rename to trunk/arch/x86_64/lib/copy_page_64.S