From 31949253a23bb4f120f808f2a6e56473add26972 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:15:39 +0200 Subject: [PATCH] --- yaml --- r: 65515 b: refs/heads/master c: ff8e90da7c3ccf2e74e7ab4a57a0ff6e0de027b0 h: refs/heads/master i: 65513: 11d4ec21ab9f0c94071dbb755eec03a30ddacd7d 65511: 8fb0f0c58452ee3dbfc4b01eafa33dfbd74d2270 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/lib/Makefile | 2 +- trunk/arch/x86_64/lib/{memcpy.S => memcpy_64.S} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/lib/{memcpy.S => memcpy_64.S} (100%) diff --git a/[refs] b/[refs] index 753ca34209b9..e3ae0e59a7bc 100644 --- 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 index d9d715d3ec9c..dce49348cebe 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.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 b/trunk/arch/x86_64/lib/memcpy_64.S similarity index 100% rename from trunk/arch/x86_64/lib/memcpy.S rename to trunk/arch/x86_64/lib/memcpy_64.S