---

yaml --- r: 65515 b: refs/heads/master c: ff8e90d h: refs/heads/master i: 65513: 11d4ec2 65511: 8fb0f0c v: v3
git-mirror · Oct 11, 2007 · 3194925 · 3194925
1 parent 5374182
commit 3194925
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42421ce3468d46cd875acd3d87384528f9fe8a39
+refs/heads/master: ff8e90da7c3ccf2e74e7ab4a57a0ff6e0de027b0
diff --git a/trunk/arch/x86_64/lib/Makefile b/trunk/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/trunk/arch/x86_64/lib/memcpy.S → trunk/arch/x86_64/lib/memcpy_64.S b/trunk/arch/x86_64/lib/memcpy.S → trunk/arch/x86_64/lib/memcpy_64.S