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

[deliverable/linux.git] / include / asm-generic / uaccess.h

diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
index 9788568f79782befb0be7cf29d148220f9c898c4..c184aa8ec8cd5c81f189ff9350e52e6e27e5b2a6 100644 (file)
--- a/include/asm-generic/uaccess.h
+++ b/include/asm-generic/uaccess.h
@@ -7,7 +7,6 @@
  * address space, e.g. all NOMMU machines.
  */
 #include <linux/sched.h>
-#include <linux/mm.h>
 #include <linux/string.h>
 
 #include <asm/segment.h>
@@ -32,7 +31,9 @@ static inline void set_fs(mm_segment_t fs)
 }
 #endif
 
+#ifndef segment_eq
 #define segment_eq(a, b) ((a).seg == (b).seg)
+#endif
 
 #define VERIFY_READ    0
 #define VERIFY_WRITE   1
@@ -168,12 +169,18 @@ static inline __must_check long __copy_to_user(void __user *to,
                -EFAULT;                                        \
 })
 
+#ifndef __put_user_fn
+
 static inline int __put_user_fn(size_t size, void __user *ptr, void *x)
 {
        size = __copy_to_user(ptr, x, size);
        return size ? -EFAULT : size;
 }
 
+#define __put_user_fn(sz, u, k)        __put_user_fn(sz, u, k)
+
+#endif
+
 extern int __put_user_bad(void) __attribute__((noreturn));
 
 #define __get_user(x, ptr)                                     \
@@ -224,12 +231,17 @@ extern int __put_user_bad(void) __attribute__((noreturn));
                -EFAULT;                                        \
 })
 
+#ifndef __get_user_fn
 static inline int __get_user_fn(size_t size, const void __user *ptr, void *x)
 {
        size = __copy_from_user(x, ptr, size);
        return size ? -EFAULT : size;
 }
 
+#define __get_user_fn(sz, u, k)        __get_user_fn(sz, u, k)
+
+#endif
+
 extern int __get_user_bad(void) __attribute__((noreturn));
 
 #ifndef __copy_from_user_inatomic