diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:17:52 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:17:52 +0200 |
| commit | 90890687859ea658759e653c4e70ed7e9e1a6217 (patch) | |
| tree | 9065b30bb189e16ef99b8b5a0d444558f8dc579f /include/asm-m32r/uaccess.h | |
| parent | [PATCH] sky2: add permanent address support. (diff) | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| download | linux-90890687859ea658759e653c4e70ed7e9e1a6217.tar.xz linux-90890687859ea658759e653c4e70ed7e9e1a6217.zip | |
Merge branch 'master'
Diffstat (limited to 'include/asm-m32r/uaccess.h')
| -rw-r--r-- | include/asm-m32r/uaccess.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/asm-m32r/uaccess.h b/include/asm-m32r/uaccess.h index 93d863c455a1..0da7c47d2f01 100644 --- a/include/asm-m32r/uaccess.h +++ b/include/asm-m32r/uaccess.h @@ -208,7 +208,8 @@ extern void __get_user_4(void); * On error, the variable @x is set to zero. */ #define get_user(x,ptr) \ -({ int __ret_gu,__val_gu; \ +({ int __ret_gu; \ + unsigned long __val_gu; \ __chk_user_ptr(ptr); \ switch(sizeof (*(ptr))) { \ case 1: __get_user_x(1,__ret_gu,__val_gu,ptr); break; \ @@ -403,7 +404,8 @@ struct __large_struct { unsigned long buf[100]; }; #define __get_user_nocheck(x,ptr,size) \ ({ \ - long __gu_err, __gu_val; \ + long __gu_err; \ + unsigned long __gu_val; \ __get_user_size(__gu_val,(ptr),(size),__gu_err); \ (x) = (__typeof__(*(ptr)))__gu_val; \ __gu_err; \ @@ -594,8 +596,8 @@ static inline unsigned long __generic_copy_to_user_nocheck(void __user *to, return n; } -unsigned long __generic_copy_to_user(void *, const void *, unsigned long); -unsigned long __generic_copy_from_user(void *, const void *, unsigned long); +unsigned long __generic_copy_to_user(void __user *, const void *, unsigned long); +unsigned long __generic_copy_from_user(void *, const void __user *, unsigned long); /** * __copy_to_user: - Copy a block of data into user space, with less checking. |