diff --git a/arch/x86_64/lib/Makefile b/arch/x86_64/lib/Makefile
index 4ecc6181db4d7420333238fb1d1123364874a77c..4611996706a3b77a32b6d166f8fdf601798ad9c4 100644
--- a/arch/x86_64/lib/Makefile
+++ b/arch/x86_64/lib/Makefile
@@ -9,5 +9,5 @@ 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.o copy_page_64.o bitstr_64.o bitops.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.o copy_user_nocache.o
diff --git a/arch/x86_64/lib/clear_page.S b/arch/x86_64/lib/clear_page_64.S
similarity index 100%
rename from arch/x86_64/lib/clear_page.S
rename to arch/x86_64/lib/clear_page_64.S