linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-powerpc/uaccess.h b/include/asm-powerpc/uaccess.h
index d83fc29..3872e92 100644 (file)
--- a/include/asm-powerpc/uaccess.h
+++ b/include/asm-powerpc/uaccess.h
@@ -7,7 +7,6 @@
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <asm/processor.h>
-#include <asm/page.h>
 
 #define VERIFY_READ    0
 #define VERIFY_WRITE   1
@@ -180,11 +179,9 @@ do {                                                               \
 #define __put_user_nocheck(x, ptr, size)                       \
 ({                                                             \
        long __pu_err;                                          \
-       __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
-       if (!is_kernel_addr((unsigned long)__pu_addr))          \
-               might_sleep();                                  \
+       might_sleep();                                          \
        __chk_user_ptr(ptr);                                    \
-       __put_user_size((x), __pu_addr, (size), __pu_err);      \
+       __put_user_size((x), (ptr), (size), __pu_err);          \
        __pu_err;                                               \
 })
 
@@ -261,11 +258,9 @@ do {                                                               \
 ({                                                             \
        long __gu_err;                                          \
        unsigned long __gu_val;                                 \
-       const __typeof__(*(ptr)) __user *__gu_addr = (ptr);     \
        __chk_user_ptr(ptr);                                    \
-       if (!is_kernel_addr((unsigned long)__gu_addr))          \
-               might_sleep();                                  \
-       __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
+       might_sleep();                                          \
+       __get_user_size(__gu_val, (ptr), (size), __gu_err);     \
        (x) = (__typeof__(*(ptr)))__gu_val;                     \
        __gu_err;                                               \
 })
@@ -275,11 +270,9 @@ do {                                                               \
 ({                                                             \
        long __gu_err;                                          \
        long long __gu_val;                                     \
-       const __typeof__(*(ptr)) __user *__gu_addr = (ptr);     \
        __chk_user_ptr(ptr);                                    \
-       if (!is_kernel_addr((unsigned long)__gu_addr))          \
-               might_sleep();                                  \
-       __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
+       might_sleep();                                          \
+       __get_user_size(__gu_val, (ptr), (size), __gu_err);     \
        (x) = (__typeof__(*(ptr)))__gu_val;                     \
        __gu_err;                                               \
 })