From 3f67c44a353e70b6d2cb396f257586bd1aada186 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:15:50 +0200 Subject: [PATCH] --- yaml --- r: 65523 b: refs/heads/master c: dcd30b189cc3879278285db616c7baecf5f6493f h: refs/heads/master i: 65521: d9e4b086e962bebd86ff16903d424c29afa56e66 65519: f62529840b768d29f33ab0b238197d51444a845e v: v3 --- [refs] | 2 +- trunk/arch/x86_64/lib/Makefile | 2 +- trunk/arch/x86_64/lib/{delay.c => delay_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/lib/{delay.c => delay_64.c} (100%) diff --git a/[refs] b/[refs] index 74729d2d3705..0fe6bd735048 100644 --- 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 index 430be2c1a59b..373615a594f4 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_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 b/trunk/arch/x86_64/lib/delay_64.c similarity index 100% rename from trunk/arch/x86_64/lib/delay.c rename to trunk/arch/x86_64/lib/delay_64.c