ppc64: use copypage_64.S from powerpc/lib

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

Hide file tree

Showing 3 changed files with 3 additions and 124 deletions.
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
@@ -5,12 +5,12 @@
 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)	+= copypage_64.o copyuser_64.o memcpy_64.o \
+obj-$(CONFIG_PPC64)	+= copyuser_64.o memcpy_64.o \
 			   usercopy_64.o sstep.o mem_64.o
 ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_SMP)	+= locks.o
 endif
 endif
 
-obj-$(CONFIG_PPC64)	+= checksum_64.o
+obj-$(CONFIG_PPC64)	+= checksum_64.o copypage_64.o
 obj-$(CONFIG_PPC_ISERIES) += e2a.o
diff --git a/arch/ppc64/lib/Makefile b/arch/ppc64/lib/Makefile
@@ -3,7 +3,7 @@
 #
 
 lib-y := string.o strcase.o
-lib-y += copypage.o memcpy.o copyuser.o usercopy.o
+lib-y += memcpy.o copyuser.o usercopy.o
 
 # Lock primitives are defined as no-ops in include/linux/spinlock.h
 # for non-SMP configs. Don't build the real versions.

diff --git a/arch/ppc64/lib/copypage.S b/arch/ppc64/lib/copypage.S