powerpc: fix __strnlen_user in merge tree

Change USER/KERNEL_DS so that the merged version of __strnlen_user can be used which allows us to complete the removal of arch/ppc64/lib/. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
git-mirror · Nov 1, 2005 · 5015b49 · 5015b49
1 parent 2df5e8b
commit 5015b49
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 254 deletions.
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
@@ -9,7 +9,7 @@ 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 usercopy_64.o mem_64.o
+			   memcpy_64.o usercopy_64.o mem_64.o string.o
 obj-$(CONFIG_PPC_ISERIES) += e2a.o
 obj-$(CONFIG_XMON)	+= sstep.o
 

diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
@@ -86,7 +86,6 @@ head-y := arch/ppc64/kernel/head.o
 head-y += arch/powerpc/kernel/fpu.o
 head-y += arch/powerpc/kernel/entry_64.o
 
-libs-y				+= arch/ppc64/lib/
 core-y				+= arch/ppc64/kernel/ arch/powerpc/kernel/
 core-y				+= arch/powerpc/mm/
 core-y				+= arch/powerpc/sysdev/

diff --git a/arch/ppc64/lib/Makefile b/arch/ppc64/lib/Makefile
diff --git a/arch/ppc64/lib/string.S b/arch/ppc64/lib/string.S