[PATCH] m68k: basic __user annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Al Viro and committed by Linus Torvalds 11c40f8a ad9ec4f8

+10 -8
+10 -8
include/asm-m68k/uaccess.h
··· 42 ({ \ 43 int __pu_err; \ 44 typeof(*(ptr)) __pu_val = (x); \ 45 switch (sizeof (*(ptr))) { \ 46 case 1: \ 47 __put_user_asm(__pu_err, __pu_val, ptr, b); \ ··· 92 ({ \ 93 int __gu_err; \ 94 typeof(*(ptr)) __gu_val; \ 95 switch (sizeof(*(ptr))) { \ 96 case 1: \ 97 __get_user_asm(__gu_err, __gu_val, ptr, b, "=d"); \ ··· 107 __gu_err = __constant_copy_from_user(&__gu_val, ptr, 8); \ 108 break; \ 109 default: \ 110 - __gu_val = 0; \ 111 __gu_err = __get_user_bad(); \ 112 break; \ 113 } \ ··· 136 : "m"(*(ptr)), "i" (-EFAULT), "0"(0)) 137 138 static inline unsigned long 139 - __generic_copy_from_user(void *to, const void *from, unsigned long n) 140 { 141 unsigned long tmp; 142 __asm__ __volatile__ ··· 191 } 192 193 static inline unsigned long 194 - __generic_copy_to_user(void *to, const void *from, unsigned long n) 195 { 196 unsigned long tmp; 197 __asm__ __volatile__ ··· 266 : "d0", "memory") 267 268 static inline unsigned long 269 - __constant_copy_from_user(void *to, const void *from, unsigned long n) 270 { 271 switch (n) { 272 case 0: ··· 522 #define __copy_from_user_inatomic __copy_from_user 523 524 static inline unsigned long 525 - __constant_copy_to_user(void *to, const void *from, unsigned long n) 526 { 527 switch (n) { 528 case 0: ··· 768 */ 769 770 static inline long 771 - strncpy_from_user(char *dst, const char *src, long count) 772 { 773 long res; 774 if (count == 0) return count; ··· 801 * 802 * Return 0 on exception, a value greater than N if too long 803 */ 804 - static inline long strnlen_user(const char *src, long n) 805 { 806 long res; 807 ··· 844 */ 845 846 static inline unsigned long 847 - clear_user(void *to, unsigned long n) 848 { 849 __asm__ __volatile__ 850 (" tstl %1\n"
··· 42 ({ \ 43 int __pu_err; \ 44 typeof(*(ptr)) __pu_val = (x); \ 45 + __chk_user_ptr(ptr); \ 46 switch (sizeof (*(ptr))) { \ 47 case 1: \ 48 __put_user_asm(__pu_err, __pu_val, ptr, b); \ ··· 91 ({ \ 92 int __gu_err; \ 93 typeof(*(ptr)) __gu_val; \ 94 + __chk_user_ptr(ptr); \ 95 switch (sizeof(*(ptr))) { \ 96 case 1: \ 97 __get_user_asm(__gu_err, __gu_val, ptr, b, "=d"); \ ··· 105 __gu_err = __constant_copy_from_user(&__gu_val, ptr, 8); \ 106 break; \ 107 default: \ 108 + __gu_val = (typeof(*(ptr)))0; \ 109 __gu_err = __get_user_bad(); \ 110 break; \ 111 } \ ··· 134 : "m"(*(ptr)), "i" (-EFAULT), "0"(0)) 135 136 static inline unsigned long 137 + __generic_copy_from_user(void *to, const void __user *from, unsigned long n) 138 { 139 unsigned long tmp; 140 __asm__ __volatile__ ··· 189 } 190 191 static inline unsigned long 192 + __generic_copy_to_user(void __user *to, const void *from, unsigned long n) 193 { 194 unsigned long tmp; 195 __asm__ __volatile__ ··· 264 : "d0", "memory") 265 266 static inline unsigned long 267 + __constant_copy_from_user(void *to, const void __user *from, unsigned long n) 268 { 269 switch (n) { 270 case 0: ··· 520 #define __copy_from_user_inatomic __copy_from_user 521 522 static inline unsigned long 523 + __constant_copy_to_user(void __user *to, const void *from, unsigned long n) 524 { 525 switch (n) { 526 case 0: ··· 766 */ 767 768 static inline long 769 + strncpy_from_user(char *dst, const char __user *src, long count) 770 { 771 long res; 772 if (count == 0) return count; ··· 799 * 800 * Return 0 on exception, a value greater than N if too long 801 */ 802 + static inline long strnlen_user(const char __user *src, long n) 803 { 804 long res; 805 ··· 842 */ 843 844 static inline unsigned long 845 + clear_user(void __user *to, unsigned long n) 846 { 847 __asm__ __volatile__ 848 (" tstl %1\n"