diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2005-09-29 01:17:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 17:46:27 +0200 |
| commit | ea8a918eb71b503be13b861dbe18b93932fd6b62 (patch) | |
| tree | 65f9fc1bd79f2d222fb6ca709cedef80625b931e /include | |
| parent | [PATCH] s390 signal annotations (diff) | |
| download | linux-ea8a918eb71b503be13b861dbe18b93932fd6b62.tar.xz linux-ea8a918eb71b503be13b861dbe18b93932fd6b62.zip | |
[PATCH] ppc64 get_user annotations
long is not uintptr_t, unsigned long is.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc64/uaccess.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-ppc64/uaccess.h b/include/asm-ppc64/uaccess.h index c181a60d868c..132c1276547b 100644 --- a/include/asm-ppc64/uaccess.h +++ b/include/asm-ppc64/uaccess.h @@ -164,7 +164,8 @@ do { \ #define __get_user_nocheck(x,ptr,size) \ ({ \ - long __gu_err, __gu_val; \ + long __gu_err; \ + unsigned long __gu_val; \ might_sleep(); \ __get_user_size(__gu_val,(ptr),(size),__gu_err,-EFAULT);\ (x) = (__typeof__(*(ptr)))__gu_val; \ @@ -173,7 +174,8 @@ do { \ #define __get_user_check(x,ptr,size) \ ({ \ - long __gu_err = -EFAULT, __gu_val = 0; \ + long __gu_err = -EFAULT; \ + unsigned long __gu_val = 0; \ const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ might_sleep(); \ if (access_ok(VERIFY_READ,__gu_addr,size)) \ |