3 files changed, 2 insertions, 44 deletions

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 0726235ef25d..15b6b2696500 100644
--- 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
index f4732c5ffd5f..42d5295bf345 100644
--- 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
deleted file mode 100644
index 5eea6f3c1e03..000000000000
--- a/arch/ppc64/lib/usercopy.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Functions which are too large to be inlined.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <linux/module.h>
-#include <asm/uaccess.h>
-
-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
-{
-        if (likely(access_ok(VERIFY_READ, from, n)))
-                n = __copy_from_user(to, from, n);
-        else
-                memset(to, 0, n);
-        return n;
-}
-
-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
-{
-        if (likely(access_ok(VERIFY_WRITE, to, n)))
-                n = __copy_to_user(to, from, n);
-        return n;
-}
-
-unsigned long copy_in_user(void __user *to, const void __user *from,
-                           unsigned long n)
-{
-        might_sleep();
-        if (likely(access_ok(VERIFY_READ, from, n) &&
-            access_ok(VERIFY_WRITE, to, n)))
-                n =__copy_tofrom_user(to, from, n);
-        return n;
-}
-
-EXPORT_SYMBOL(copy_from_user);
-EXPORT_SYMBOL(copy_to_user);
-EXPORT_SYMBOL(copy_in_user);
-