[PATCH] ia64 basic __user annotations

- document places where we pass kernel address to low-level primitive
that deals with kernel/user addresses
- uintptr_t is unsigned long, not long

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Al Viro and committed by Linus Torvalds 0cc13a54 272cd2b7

+6 -6
+6 -6
include/asm-ia64/uaccess.h
··· 187 187 ({ \ 188 188 const __typeof__(*(ptr)) __user *__gu_ptr = (ptr); \ 189 189 __typeof__ (size) __gu_size = (size); \ 190 - long __gu_err = -EFAULT, __gu_val = 0; \ 191 - \ 190 + long __gu_err = -EFAULT; \ 191 + unsigned long __gu_val = 0; \ 192 192 if (!check || __access_ok(__gu_ptr, size, segment)) \ 193 193 switch (__gu_size) { \ 194 194 case 1: __get_user_size(__gu_val, __gu_ptr, 1, __gu_err); break; \ ··· 240 240 static inline unsigned long 241 241 __copy_to_user (void __user *to, const void *from, unsigned long count) 242 242 { 243 - return __copy_user(to, (void __user *) from, count); 243 + return __copy_user(to, (__force void __user *) from, count); 244 244 } 245 245 246 246 static inline unsigned long 247 247 __copy_from_user (void *to, const void __user *from, unsigned long count) 248 248 { 249 - return __copy_user((void __user *) to, from, count); 249 + return __copy_user((__force void __user *) to, from, count); 250 250 } 251 251 252 252 #define __copy_to_user_inatomic __copy_to_user ··· 258 258 long __cu_len = (n); \ 259 259 \ 260 260 if (__access_ok(__cu_to, __cu_len, get_fs())) \ 261 - __cu_len = __copy_user(__cu_to, (void __user *) __cu_from, __cu_len); \ 261 + __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \ 262 262 __cu_len; \ 263 263 }) 264 264 ··· 270 270 \ 271 271 __chk_user_ptr(__cu_from); \ 272 272 if (__access_ok(__cu_from, __cu_len, get_fs())) \ 273 - __cu_len = __copy_user((void __user *) __cu_to, __cu_from, __cu_len); \ 273 + __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ 274 274 __cu_len; \ 275 275 }) 276 276