ppc64: use usercopy_64.c from powerpc/lib

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

Hide file tree

Showing 3 changed files with 2 additions and 44 deletions.
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
@@ -4,13 +4,13 @@
 
 ifeq ($(CONFIG_PPC_MERGE),y)
 obj-y			:= string.o
-obj-$(CONFIG_PPC64)	+= usercopy_64.o mem_64.o
+obj-$(CONFIG_PPC64)	+= mem_64.o
 endif
 
 obj-y			+= strcase.o
 obj-$(CONFIG_PPC32)	+= div64.o copy_32.o checksum_32.o
 obj-$(CONFIG_PPC64)	+= checksum_64.o copypage_64.o copyuser_64.o \
-			   memcpy_64.o
+			   memcpy_64.o usercopy_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,4 +3,3 @@
 #
 
 lib-y := string.o
-lib-y += usercopy.o
diff --git a/arch/ppc64/lib/usercopy.c b/arch/ppc64/lib/usercopy.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@
		#

		lib-y := string.o
		lib-y += usercopy.o