diff --git a/arch/x86_64/lib/Makefile b/arch/x86_64/lib/Makefile
index 01a4178b6ea7..9212301b6427 100644
--- a/arch/x86_64/lib/Makefile
+++ b/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.o putuser.o  \
+	usercopy.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/arch/x86_64/lib/getuser.S b/arch/x86_64/lib/getuser_64.S
similarity index 100%
rename from arch/x86_64/lib/getuser.S
rename to arch/x86_64/lib/getuser_64.S