Merge branch 'x86-uaccess-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / x86 / include / asm / uaccess_64.h

diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
index 64476bb2a1465dcf6ce15dc2a939ad1fb54fe7bf..190413d0de57b20a3334a9fcaaf8bcfbdd6fd14f 100644 (file)
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -45,37 +45,9 @@ copy_user_generic(void *to, const void *from, unsigned len)
        return ret;
 }
 
-__must_check unsigned long
-_copy_to_user(void __user *to, const void *from, unsigned len);
-__must_check unsigned long
-_copy_from_user(void *to, const void __user *from, unsigned len);
 __must_check unsigned long
 copy_in_user(void __user *to, const void __user *from, unsigned len);
 
-static inline unsigned long __must_check copy_from_user(void *to,
-                                         const void __user *from,
-                                         unsigned long n)
-{
-       int sz = __compiletime_object_size(to);
-
-       might_fault();
-       if (likely(sz == -1 || sz >= n))
-               n = _copy_from_user(to, from, n);
-#ifdef CONFIG_DEBUG_VM
-       else
-               WARN(1, "Buffer overflow detected!\n");
-#endif
-       return n;
-}
-
-static __always_inline __must_check
-int copy_to_user(void __user *dst, const void *src, unsigned size)
-{
-       might_fault();
-
-       return _copy_to_user(dst, src, size);
-}
-
 static __always_inline __must_check
 int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
 {