]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - include/asm-x86/uaccess_64.h
[IA64] utrace use generic trace hook
[linux-2.6-omap-h63xx.git] / include / asm-x86 / uaccess_64.h
index 81308763a4c13f28636436092e1ef0e49561dcc4..45806d60bcbedc0fb51208508fc0b0d5b991d04b 100644 (file)
@@ -7,150 +7,9 @@
 #include <linux/compiler.h>
 #include <linux/errno.h>
 #include <linux/prefetch.h>
+#include <linux/lockdep.h>
 #include <asm/page.h>
 
-#define ARCH_HAS_SEARCH_EXTABLE
-
-extern void __put_user_1(void);
-extern void __put_user_2(void);
-extern void __put_user_4(void);
-extern void __put_user_8(void);
-extern void __put_user_bad(void);
-
-#define __put_user_x(size, ret, x, ptr)                                        \
-       asm volatile("call __put_user_" #size                           \
-                    :"=a" (ret)                                        \
-                    :"c" (ptr),"a" (x)                                 \
-                    :"ebx")
-
-#define put_user(x, ptr)                                               \
-       __put_user_check((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
-
-#define __get_user(x, ptr)                                             \
-       __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
-#define __put_user(x, ptr)                                             \
-       __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
-
-#define __get_user_unaligned __get_user
-#define __put_user_unaligned __put_user
-
-#define __put_user_nocheck(x, ptr, size)               \
-({                                                     \
-       int __pu_err;                                   \
-       __put_user_size((x), (ptr), (size), __pu_err);  \
-       __pu_err;                                       \
-})
-
-
-#define __put_user_check(x, ptr, size)                         \
-({                                                             \
-       int __pu_err;                                           \
-       typeof(*(ptr)) __user *__pu_addr = (ptr);               \
-       switch (size) {                                         \
-       case 1:                                                 \
-               __put_user_x(1, __pu_err, x, __pu_addr);        \
-               break;                                          \
-       case 2:                                                 \
-               __put_user_x(2, __pu_err, x, __pu_addr);        \
-               break;                                          \
-       case 4:                                                 \
-               __put_user_x(4, __pu_err, x, __pu_addr);        \
-               break;                                          \
-       case 8:                                                 \
-               __put_user_x(8, __pu_err, x, __pu_addr);        \
-               break;                                          \
-       default:                                                \
-               __put_user_bad();                               \
-       }                                                       \
-       __pu_err;                                               \
-})
-
-#define __put_user_size(x, ptr, size, retval)                          \
-do {                                                                   \
-       retval = 0;                                                     \
-       __chk_user_ptr(ptr);                                            \
-       switch (size) {                                                 \
-       case 1:                                                         \
-               __put_user_asm(x, ptr, retval, "b", "b", "iq", -EFAULT);\
-               break;                                                  \
-       case 2:                                                         \
-               __put_user_asm(x, ptr, retval, "w", "w", "ir", -EFAULT);\
-               break;                                                  \
-       case 4:                                                         \
-               __put_user_asm(x, ptr, retval, "l", "k", "ir", -EFAULT);\
-               break;                                                  \
-       case 8:                                                         \
-               __put_user_asm(x, ptr, retval, "q", "", "Zr", -EFAULT); \
-               break;                                                  \
-       default:                                                        \
-               __put_user_bad();                                       \
-       }                                                               \
-} while (0)
-
-/* FIXME: this hack is definitely wrong -AK */
-struct __large_struct { unsigned long buf[100]; };
-#define __m(x) (*(struct __large_struct __user *)(x))
-
-/*
- * Tell gcc we read from memory instead of writing: this is because
- * we do not write to any memory gcc knows about, so there are no
- * aliasing issues.
- */
-#define __put_user_asm(x, addr, err, itype, rtype, ltype, errno)       \
-       asm volatile("1:        mov"itype" %"rtype"1,%2\n"              \
-                    "2:\n"                                             \
-                    ".section .fixup, \"ax\"\n"                        \
-                    "3:        mov %3,%0\n"                            \
-                    "  jmp 2b\n"                                       \
-                    ".previous\n"                                      \
-                    _ASM_EXTABLE(1b, 3b)                               \
-                    : "=r"(err)                                        \
-                    : ltype (x), "m" (__m(addr)), "i" (errno), "0" (err))
-
-
-#define __get_user_nocheck(x, ptr, size)                       \
-({                                                             \
-       int __gu_err;                                           \
-       unsigned long __gu_val;                                 \
-       __get_user_size(__gu_val, (ptr), (size), __gu_err);     \
-       (x) = (__force typeof(*(ptr)))__gu_val;                 \
-       __gu_err;                                               \
-})
-
-#define __get_user_size(x, ptr, size, retval)                          \
-do {                                                                   \
-       retval = 0;                                                     \
-       __chk_user_ptr(ptr);                                            \
-       switch (size) {                                                 \
-       case 1:                                                         \
-               __get_user_asm(x, ptr, retval, "b", "b", "=q", -EFAULT);\
-               break;                                                  \
-       case 2:                                                         \
-               __get_user_asm(x, ptr, retval, "w", "w", "=r", -EFAULT);\
-               break;                                                  \
-       case 4:                                                         \
-               __get_user_asm(x, ptr, retval, "l", "k", "=r", -EFAULT);\
-               break;                                                  \
-       case 8:                                                         \
-               __get_user_asm(x, ptr, retval, "q", "", "=r", -EFAULT); \
-               break;                                                  \
-       default:                                                        \
-               (x) = __get_user_bad();                                 \
-       }                                                               \
-} while (0)
-
-#define __get_user_asm(x, addr, err, itype, rtype, ltype, errno)       \
-       asm volatile("1:        mov"itype" %2,%"rtype"1\n"              \
-                    "2:\n"                                             \
-                    ".section .fixup, \"ax\"\n"                        \
-                    "3:        mov %3,%0\n"                            \
-                    "  xor"itype" %"rtype"1,%"rtype"1\n"               \
-                    "  jmp 2b\n"                                       \
-                    ".previous\n"                                      \
-                    _ASM_EXTABLE(1b, 3b)                               \
-                    : "=r" (err), ltype (x)                            \
-                    : "m" (__m(addr)), "i"(errno), "0"(err))
-
 /*
  * Copy To/From Userspace
  */
@@ -320,7 +179,6 @@ __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
        return copy_user_generic((__force void *)dst, src, size);
 }
 
-#define ARCH_HAS_NOCACHE_UACCESS 1
 extern long __copy_user_nocache(void *dst, const void __user *src,
                                unsigned size, int zerorest);
 
@@ -338,4 +196,7 @@ static inline int __copy_from_user_inatomic_nocache(void *dst,
        return __copy_user_nocache(dst, src, size, 0);
 }
 
+unsigned long
+copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
+
 #endif /* __X86_64_UACCESS_H */