From 3c6dba2a2860e8f701b6cdb7e14bc4e81440bfb1 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:15:55 +0200 Subject: [PATCH] --- yaml --- r: 65526 b: refs/heads/master c: 2a6c7b6bbfefbe37dbbc31a209dbf0166ee51a07 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/lib/Makefile | 2 +- trunk/arch/x86_64/lib/{memset.S => memset_64.S} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/lib/{memset.S => memset_64.S} (100%) diff --git a/[refs] b/[refs] index 856a14044976..41a7a710ba37 100644 --- 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 index 6bdf7d824f4c..09c1ffa974a9 100644 --- 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 b/trunk/arch/x86_64/lib/memset_64.S similarity index 100% rename from trunk/arch/x86_64/lib/memset.S rename to trunk/arch/x86_64/lib/memset_64.S