openrisc: switch to RAW_COPY_USER

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 1e95920b07377417415c8622201d8e04bfd1f1a7..38954181fa96d1206e3a164e0cc009b4e8435cc8 100644 (file)
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -28,6 +28,7 @@ config OPENRISC
        select OR1K_PIC
        select CPU_NO_EFFICIENT_FFS if !OPENRISC_HAVE_INST_FF1
        select NO_BOOTMEM
+       select ARCH_HAS_RAW_COPY_USER
 
 config MMU
        def_bool y

diff --git a/arch/openrisc/include/asm/uaccess.h b/arch/openrisc/include/asm/uaccess.h
index 92236c9e7c7d70de09db2c4655f0f0fc64ab45cb..96fc425271c2eebc8733025a7a9418c281e283d2 100644 (file)
--- a/arch/openrisc/include/asm/uaccess.h
+++ b/arch/openrisc/include/asm/uaccess.h
@@ -236,34 +236,18 @@ do {                                                                      \
 
 extern unsigned long __must_check
 __copy_tofrom_user(void *to, const void *from, unsigned long size);
-
-#define __copy_from_user(to, from, size) \
-       __copy_tofrom_user(to, from, size)
-#define __copy_to_user(to, from, size) \
-       __copy_tofrom_user(to, from, size)
-
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
-
 static inline unsigned long
-copy_from_user(void *to, const void *from, unsigned long n)
+raw_copy_from_user(void *to, const void __user *from, unsigned long size)
 {
-       unsigned long res = n;
-
-       if (likely(access_ok(VERIFY_READ, from, n)))
-               res = __copy_tofrom_user(to, from, n);
-       if (unlikely(res))
-               memset(to + (n - res), 0, res);
-       return res;
+       return __copy_tofrom_user(to, (__force const void *)from, size);
 }
-
 static inline unsigned long
-copy_to_user(void *to, const void *from, unsigned long n)
+raw_copy_to_user(void *to, const void __user *from, unsigned long size)
 {
-       if (likely(access_ok(VERIFY_WRITE, to, n)))
-               n = __copy_tofrom_user(to, from, n);
-       return n;
+       return __copy_tofrom_user((__force void *)to, from, size);
 }
+#define INLINE_COPY_FROM_USER
+#define INLINE_COPY_TO_USER
 
 extern unsigned long __clear_user(void *addr, unsigned long size);