ppc64: use memcpy_64.S from powerpc/lib

since it is identical to mempcy.S from ppc64/lib. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
git-mirror · Oct 28, 2005 · 12a3940 · 12a3940
1 parent ecc81e0
commit 12a3940
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 176 deletions.
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
@@ -5,11 +5,11 @@
 ifeq ($(CONFIG_PPC_MERGE),y)
 obj-y			:= strcase.o string.o
 obj-$(CONFIG_PPC32)	+= div64.o copy_32.o checksum_32.o
-obj-$(CONFIG_PPC64)	+= memcpy_64.o \
-			   usercopy_64.o sstep.o mem_64.o
+obj-$(CONFIG_PPC64)	+= usercopy_64.o sstep.o mem_64.o
 endif
 
-obj-$(CONFIG_PPC64)	+= checksum_64.o copypage_64.o copyuser_64.o
+obj-$(CONFIG_PPC64)	+= checksum_64.o copypage_64.o copyuser_64.o \
+			   memcpy_64.o
 obj-$(CONFIG_PPC_ISERIES) += e2a.o
 ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_SMP)	+= locks.o

diff --git a/arch/ppc64/lib/Makefile b/arch/ppc64/lib/Makefile
@@ -3,6 +3,6 @@
 #
 
 lib-y := string.o strcase.o
-lib-y += memcpy.o usercopy.o
+lib-y += usercopy.o
 
 lib-$(CONFIG_DEBUG_KERNEL) += sstep.o
diff --git a/arch/ppc64/lib/memcpy.S b/arch/ppc64/lib/memcpy.S