patch-2_6_7-vs1_9_1_12

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

diff --git a/include/asm-ppc64/uaccess.h b/include/asm-ppc64/uaccess.h
index 0a031ab..9423be5 100644 (file)
--- a/include/asm-ppc64/uaccess.h
+++ b/include/asm-ppc64/uaccess.h
@@ -54,7 +54,7 @@
        (((segment).seg & (addr | size )) == 0)
 
 #define access_ok(type,addr,size) \
-       __access_ok(((unsigned long)(addr)),(size),get_fs())
+       __access_ok(((__force unsigned long)(addr)),(size),get_fs())
 
 static inline int verify_area(int type, const void __user *addr, unsigned long size)
 {
@@ -116,6 +116,7 @@ extern long __put_user_bad(void);
 #define __put_user_nocheck(x,ptr,size)                         \
 ({                                                             \
        long __pu_err;                                          \
+       __chk_user_ptr(ptr);                                    \
        __put_user_size((x),(ptr),(size),__pu_err,-EFAULT);     \
        __pu_err;                                               \
 })
@@ -123,7 +124,7 @@ extern long __put_user_bad(void);
 #define __put_user_check(x,ptr,size)                                   \
 ({                                                                     \
        long __pu_err = -EFAULT;                                        \
-       __typeof__(*(ptr)) *__pu_addr = (ptr);                          \
+       void __user *__pu_addr = (ptr);                                 \
        if (access_ok(VERIFY_WRITE,__pu_addr,size))                     \
                __put_user_size((x),__pu_addr,(size),__pu_err,-EFAULT); \
        __pu_err;                                                       \
@@ -187,6 +188,7 @@ extern long __get_user_bad(void);
 do {                                                                   \
        might_sleep();                                                  \
        retval = 0;                                                     \
+       __chk_user_ptr(ptr);                                            \
        switch (size) {                                                 \
          case 1: __get_user_asm(x,ptr,retval,"lbz",errret); break;     \
          case 2: __get_user_asm(x,ptr,retval,"lhz",errret); break;     \