---

yaml --- r: 65523 b: refs/heads/master c: dcd30b1 h: refs/heads/master i: 65521: d9e4b08 65519: f625298 v: v3
git-mirror · Oct 11, 2007 · 3f67c44 · 3f67c44
1 parent 084b8db
commit 3f67c44
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: a856413e26785ea5585c06b1aa773ed44bc116aa
+refs/heads/master: dcd30b189cc3879278285db616c7baecf5f6493f
diff --git 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_64.o delay.o \
+lib-y := csum-partial.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/delay.c → trunk/arch/x86_64/lib/delay_64.c b/trunk/arch/x86_64/lib/delay.c → trunk/arch/x86_64/lib/delay_64.c