vserver 2.0 rc7

[linux-2.6.git] / include / asm-ppc64 / uaccess.h

diff --git a/include/asm-ppc64/uaccess.h b/include/asm-ppc64/uaccess.h
index e5cdda1..05b5943 100644 (file)
--- a/include/asm-ppc64/uaccess.h
+++ b/include/asm-ppc64/uaccess.h
@@ -56,7 +56,8 @@
 #define access_ok(type,addr,size) \
        __access_ok(((__force unsigned long)(addr)),(size),get_fs())
 
-static inline int verify_area(int type, const void __user *addr, unsigned long size)
+/* this function will go away soon - use access_ok() instead */
+static inline int __deprecated verify_area(int type, const void __user *addr, unsigned long size)
 {
        return access_ok(type,addr,size) ? 0 : -EFAULT;
 }
@@ -119,6 +120,7 @@ extern long __put_user_bad(void);
 #define __put_user_nocheck(x,ptr,size)                         \
 ({                                                             \
        long __pu_err;                                          \
+       might_sleep();                                          \
        __chk_user_ptr(ptr);                                    \
        __put_user_size((x),(ptr),(size),__pu_err,-EFAULT);     \
        __pu_err;                                               \
@@ -128,6 +130,7 @@ extern long __put_user_bad(void);
 ({                                                                     \
        long __pu_err = -EFAULT;                                        \
        void __user *__pu_addr = (ptr);                                 \
+       might_sleep();                                                  \
        if (access_ok(VERIFY_WRITE,__pu_addr,size))                     \
                __put_user_size((x),__pu_addr,(size),__pu_err,-EFAULT); \
        __pu_err;                                                       \
@@ -135,7 +138,6 @@ extern long __put_user_bad(void);
 
 #define __put_user_size(x,ptr,size,retval,errret)                      \
 do {                                                                   \
-       might_sleep();                                                  \
        retval = 0;                                                     \
        switch (size) {                                                 \
          case 1: __put_user_asm(x,ptr,retval,"stb",errret); break;     \
@@ -170,6 +172,7 @@ do {                                                                        \
 #define __get_user_nocheck(x,ptr,size)                         \
 ({                                                             \
        long __gu_err, __gu_val;                                \
+       might_sleep();                                          \
        __get_user_size(__gu_val,(ptr),(size),__gu_err,-EFAULT);\
        (x) = (__typeof__(*(ptr)))__gu_val;                     \
        __gu_err;                                               \
@@ -179,6 +182,7 @@ do {                                                                        \
 ({                                                                     \
        long __gu_err = -EFAULT, __gu_val = 0;                          \
        const __typeof__(*(ptr)) __user *__gu_addr = (ptr);             \
+       might_sleep();                                                  \
        if (access_ok(VERIFY_READ,__gu_addr,size))                      \
                __get_user_size(__gu_val,__gu_addr,(size),__gu_err,-EFAULT);\
        (x) = (__typeof__(*(ptr)))__gu_val;                             \
@@ -189,7 +193,6 @@ extern long __get_user_bad(void);
 
 #define __get_user_size(x,ptr,size,retval,errret)                      \
 do {                                                                   \
-       might_sleep();                                                  \
        retval = 0;                                                     \
        __chk_user_ptr(ptr);                                            \
        switch (size) {                                                 \
@@ -223,9 +226,8 @@ extern unsigned long __copy_tofrom_user(void __user *to, const void __user *from
                                        unsigned long size);
 
 static inline unsigned long
-__copy_from_user(void *to, const void __user *from, unsigned long n)
+__copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
 {
-       might_sleep();
        if (__builtin_constant_p(n)) {
                unsigned long ret;
 
@@ -248,9 +250,15 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
 }
 
 static inline unsigned long
-__copy_to_user(void __user *to, const void *from, unsigned long n)
+__copy_from_user(void *to, const void __user *from, unsigned long n)
 {
        might_sleep();
+       return __copy_from_user_inatomic(to, from, n);
+}
+
+static inline unsigned long
+__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
+{
        if (__builtin_constant_p(n)) {
                unsigned long ret;
 
@@ -272,6 +280,13 @@ __copy_to_user(void __user *to, const void *from, unsigned long n)
        return __copy_tofrom_user(to, (__force const void __user *) from, n);
 }
 
+static inline unsigned long
+__copy_to_user(void __user *to, const void *from, unsigned long n)
+{
+       might_sleep();
+       return __copy_to_user_inatomic(to, from, n);
+}
+
 #define __copy_in_user(to, from, size) \
        __copy_tofrom_user((to), (from), (size))
 
@@ -284,9 +299,6 @@ extern unsigned long copy_in_user(void __user *to, const void __user *from,
 
 extern unsigned long __clear_user(void __user *addr, unsigned long size);
 
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
-
 static inline unsigned long
 clear_user(void __user *addr, unsigned long size)
 {