vserver 2.0 rc7

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

diff --git a/include/asm-s390/uaccess.h b/include/asm-s390/uaccess.h
index 5eda2c3..a7f43a2 100644 (file)
--- a/include/asm-s390/uaccess.h
+++ b/include/asm-s390/uaccess.h
@@ -65,7 +65,8 @@
 
 #define access_ok(type,addr,size) __access_ok(addr,size)
 
-extern inline int verify_area(int type, const void __user *addr,
+/* this function will go away soon - use access_ok() instead */
+extern inline int __deprecated verify_area(int type, const void __user *addr,
                                                unsigned long size)
 {
        return access_ok(type, addr, size) ? 0 : -EFAULT;
@@ -161,7 +162,7 @@ struct exception_table_entry
                __put_user_asm(__x, ptr, __pu_err);             \
                break;                                          \
        default:                                                \
-               __pu_err = __put_user_bad();                    \
+               __put_user_bad();                               \
                break;                                          \
         }                                                      \
        __pu_err;                                               \
@@ -182,7 +183,7 @@ struct exception_table_entry
 })
 
 
-extern int __put_user_bad(void);
+extern int __put_user_bad(void) __attribute__((noreturn));
 
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
 #define __get_user_asm(x, ptr, err) \
@@ -225,8 +226,7 @@ extern int __put_user_bad(void);
                __get_user_asm(__x, ptr, __gu_err);             \
                break;                                          \
        default:                                                \
-               __x = 0;                                        \
-               __gu_err = __get_user_bad();                    \
+               __get_user_bad();                               \
                break;                                          \
        }                                                       \
        (x) = __x;                                              \
@@ -248,7 +248,7 @@ extern int __put_user_bad(void);
        __get_user(x, ptr);                                     \
 })
 
-extern int __get_user_bad(void);
+extern int __get_user_bad(void) __attribute__((noreturn));
 
 #define __put_user_unaligned __put_user
 #define __get_user_unaligned __get_user