diff --git a/[refs] b/[refs]
index 0fe6bd735048..2dc8364ae92f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcd30b189cc3879278285db616c7baecf5f6493f
+refs/heads/master: 21767fad2ba94675bcf49c0796b4b2a65702c974
diff --git a/trunk/arch/x86_64/lib/Makefile b/trunk/arch/x86_64/lib/Makefile
index 373615a594f4..6b510f97cab5 100644
--- a/trunk/arch/x86_64/lib/Makefile
+++ b/trunk/arch/x86_64/lib/Makefile
@@ -2,12 +2,12 @@
 # Makefile for x86_64-specific library files.
 #
 
-CFLAGS_csum-partial.o := -funroll-loops
+CFLAGS_csum-partial_64.o := -funroll-loops
 
 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_64.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.o copy_user.o rwlock_64.o copy_user_nocache_64.o
diff --git a/trunk/arch/x86_64/lib/csum-partial.c b/trunk/arch/x86_64/lib/csum-partial_64.c
similarity index 100%
rename from trunk/arch/x86_64/lib/csum-partial.c
rename to trunk/arch/x86_64/lib/csum-partial_64.c