---

yaml --- r: 65526 b: refs/heads/master c: 2a6c7b6 h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · 3c6dba2 · 3c6dba2
1 parent 586ea28
commit 3c6dba2
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: e72ba5136d3c56eaf6a9654e2f8545354c196efc
+refs/heads/master: 2a6c7b6bbfefbe37dbbc31a209dbf0166ee51a07
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_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
+lib-y += memcpy_64.o memmove_64.o memset_64.o copy_user.o rwlock_64.o copy_user_nocache_64.o
diff --git a/trunk/arch/x86_64/lib/memset.S → trunk/arch/x86_64/lib/memset_64.S b/trunk/arch/x86_64/lib/memset.S → trunk/arch/x86_64/lib/memset_64.S