[PATCH] s390 misc __user annotations

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

diff --git a/include/asm-s390/uaccess.h b/include/asm-s390/uaccess.h
index 10a619da4761cddd316266891b26c5f69b86cb43..e2c73b45de40d7d1871185a834c889202a9e4650 100644 (file)
--- a/include/asm-s390/uaccess.h
+++ b/include/asm-s390/uaccess.h
@@ -61,8 +61,10 @@
 #define segment_eq(a,b) ((a).ar4 == (b).ar4)
 
 
-#define __access_ok(addr,size) (1)
-
+static inline int __access_ok(const void __user *addr, unsigned long size)
+{
+       return 1;
+}
 #define access_ok(type,addr,size) __access_ok(addr,size)
 
 /*
@@ -206,25 +208,25 @@ extern int __put_user_bad(void) __attribute__((noreturn));
        case 1: {                                               \
                unsigned char __x;                              \
                __get_user_asm(__x, ptr, __gu_err);             \
-               (x) = (__typeof__(*(ptr))) __x;                 \
+               (x) = *(__typeof__(*(ptr)) *) &__x;             \
                break;                                          \
        };                                                      \
        case 2: {                                               \
                unsigned short __x;                             \
                __get_user_asm(__x, ptr, __gu_err);             \
-               (x) = (__typeof__(*(ptr))) __x;                 \
+               (x) = *(__typeof__(*(ptr)) *) &__x;             \
                break;                                          \
        };                                                      \
        case 4: {                                               \
                unsigned int __x;                               \
                __get_user_asm(__x, ptr, __gu_err);             \
-               (x) = (__typeof__(*(ptr))) __x;                 \
+               (x) = *(__typeof__(*(ptr)) *) &__x;             \
                break;                                          \
        };                                                      \
        case 8: {                                               \
                unsigned long long __x;                         \
                __get_user_asm(__x, ptr, __gu_err);             \
-               (x) = (__typeof__(*(ptr))) __x;                 \
+               (x) = *(__typeof__(*(ptr)) *) &__x;             \
                break;                                          \
        };                                                      \
        default:                                                \