diff --git a/arch/x86_64/lib/Makefile b/arch/x86_64/lib/Makefile
index d9d715d3ec9c1768496aadb9d38dd2581c940835..dce49348cebe82bddf453b9102e939a064ac26c4 100644
--- a/arch/x86_64/lib/Makefile
+++ b/arch/x86_64/lib/Makefile
@@ -10,4 +10,4 @@ obj-$(CONFIG_SMP)	+= msr-on-cpu.o
 lib-y := csum-partial.o csum-copy_64.o csum-wrappers.o delay.o \
 	usercopy.o getuser.o putuser.o  \
 	thunk_64.o clear_page_64.o copy_page_64.o bitstr_64.o bitops.o
-lib-y += memcpy.o memmove.o memset.o copy_user.o rwlock_64.o copy_user_nocache.o
+lib-y += memcpy_64.o memmove.o memset.o copy_user.o rwlock_64.o copy_user_nocache.o
diff --git a/arch/x86_64/lib/memcpy.S b/arch/x86_64/lib/memcpy_64.S
similarity index 100%
rename from arch/x86_64/lib/memcpy.S
rename to arch/x86_64/lib/memcpy_64.S