summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/lib
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-31 18:39:20 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2005-11-01 14:34:17 +1100
commit5015b49448cbe5352b9cc232333ab26f3e608a07 (patch)
tree77267c0fbc585ee6988a33ffec49030c6c2b5030 /arch/powerpc/lib
parent2df5e8bcca53e528a78ee0e3b114d0d21dd6d043 (diff)
downloadop-kernel-dev-5015b49448cbe5352b9cc232333ab26f3e608a07.zip
op-kernel-dev-5015b49448cbe5352b9cc232333ab26f3e608a07.tar.gz
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>
Diffstat (limited to 'arch/powerpc/lib')
-rw-r--r--arch/powerpc/lib/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index e6b2be3..dfb33915 100644
--- 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
OpenPOWER on IntegriCloud