summaryrefslogtreecommitdiff
path: root/arch/ppc64/lib
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-27 17:28:21 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-28 12:54:26 +1000
commita4a264f144d5389a52d467a7e41bec2834cfde75 (patch)
tree6366953476ea5d4ab7a53444260068e4141debf8 /arch/ppc64/lib
parenta2b0ca84a1198505f0b3c7b55b7769dd5dbd0791 (diff)
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>
Diffstat (limited to 'arch/ppc64/lib')
-rw-r--r--arch/ppc64/lib/Makefile1
-rw-r--r--arch/ppc64/lib/usercopy.c41
2 files changed, 0 insertions, 42 deletions
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);
-