vserver 1.9.5.x5

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

diff --git a/include/asm-sparc64/uaccess.h b/include/asm-sparc64/uaccess.h
index 1aff19c..5664681 100644 (file)
--- a/include/asm-sparc64/uaccess.h
+++ b/include/asm-sparc64/uaccess.h
@@ -49,10 +49,10 @@ do {                                                                                \
        __asm__ __volatile__ ("wr %%g0, %0, %%asi" : : "r" ((val).seg));        \
 } while(0)
 
-#define __user_ok(addr,size) 1
+#define __user_ok(addr,size) ((void)(addr), (void)(size), 1)
 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
-#define __access_ok(addr,size) 1
-#define access_ok(type,addr,size) 1
+#define __access_ok(addr,size) ((void)(addr), (void)(size), 1)
+#define access_ok(type,addr,size) ((void)(type), (void)(addr), (void)(size), 1)
 
 static inline int verify_area(int type, const void __user * addr, unsigned long size)
 {
@@ -253,12 +253,13 @@ __asm__ __volatile__(                                                     \
 
 extern int __get_user_bad(void);
 
-extern unsigned long ___copy_from_user(void *to, const void __user *from,
-                                      unsigned long size);
+extern unsigned long __must_check ___copy_from_user(void *to,
+                                                   const void __user *from,
+                                                   unsigned long size);
 extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
                                          unsigned long size);
-static inline unsigned long copy_from_user(void *to, const void __user *from,
-                                          unsigned long size)
+static inline unsigned long __must_check
+copy_from_user(void *to, const void __user *from, unsigned long size)
 {
        unsigned long ret = ___copy_from_user(to, from, size);
 
@@ -268,12 +269,13 @@ static inline unsigned long copy_from_user(void *to, const void __user *from,
 }
 #define __copy_from_user copy_from_user
 
-extern unsigned long ___copy_to_user(void __user *to, const void *from,
-                                    unsigned long size);
+extern unsigned long __must_check ___copy_to_user(void __user *to,
+                                                 const void *from,
+                                                 unsigned long size);
 extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
                                        unsigned long size);
-static inline unsigned long copy_to_user(void __user *to, const void *from,
-                                        unsigned long size)
+static inline unsigned long __must_check
+copy_to_user(void __user *to, const void *from, unsigned long size)
 {
        unsigned long ret = ___copy_to_user(to, from, size);
 
@@ -283,12 +285,13 @@ static inline unsigned long copy_to_user(void __user *to, const void *from,
 }
 #define __copy_to_user copy_to_user
 
-extern unsigned long ___copy_in_user(void __user *to, const void __user *from,
-                                    unsigned long size);
+extern unsigned long __must_check ___copy_in_user(void __user *to,
+                                                 const void __user *from,
+                                                 unsigned long size);
 extern unsigned long copy_in_user_fixup(void __user *to, void __user *from,
                                        unsigned long size);
-static inline unsigned long copy_in_user(void __user *to, void __user *from,
-                                        unsigned long size)
+static inline unsigned long __must_check
+copy_in_user(void __user *to, void __user *from, unsigned long size)
 {
        unsigned long ret = ___copy_in_user(to, from, size);
 
@@ -298,9 +301,10 @@ static inline unsigned long copy_in_user(void __user *to, void __user *from,
 }
 #define __copy_in_user copy_in_user
 
-extern unsigned long __bzero_noasi(void __user *, unsigned long);
+extern unsigned long __must_check __bzero_noasi(void __user *, unsigned long);
 
-static inline unsigned long __clear_user(void __user *addr, unsigned long size)
+static inline unsigned long __must_check
+__clear_user(void __user *addr, unsigned long size)
 {
        
        return __bzero_noasi(addr, size);
@@ -308,7 +312,7 @@ static inline unsigned long __clear_user(void __user *addr, unsigned long size)
 
 #define clear_user __clear_user
 
-extern long __strncpy_from_user(char *dest, const char __user *src, long count);
+extern long __must_check __strncpy_from_user(char *dest, const char __user *src, long count);
 
 #define strncpy_from_user __strncpy_from_user