diff --git a/[refs] b/[refs] index 2977b9e1ab12..c62525f26a21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fa2ae8e9e6c5a23e0e3955d3c0d55c1e08e603f +refs/heads/master: 83aaddb721364e55b4df373073019cfdf170a7be diff --git a/trunk/arch/x86_64/lib/Makefile b/trunk/arch/x86_64/lib/Makefile index ca4df1ee6539..01a4178b6ea7 100644 --- a/trunk/arch/x86_64/lib/Makefile +++ b/trunk/arch/x86_64/lib/Makefile @@ -7,7 +7,7 @@ CFLAGS_csum-partial.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.o delay.o \ +lib-y := csum-partial.o csum-copy_64.o csum-wrappers_64.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_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-wrappers.c b/trunk/arch/x86_64/lib/csum-wrappers_64.c similarity index 100% rename from trunk/arch/x86_64/lib/csum-wrappers.c rename to trunk/arch/x86_64/lib/csum-wrappers_64.c