[PATCH] ppc64 get_user annotations
Al Viro
viro at ftp.linux.org.uk
Thu Sep 29 09:17:49 EST 2005
long is not uintptr_t, unsigned long is.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
----
diff -urN RC14-rc2-git6-proc_mkdir/include/asm-ppc64/uaccess.h RC14-rc2-git6-ppc64-user/include/asm-ppc64/uaccess.h
--- RC14-rc2-git6-proc_mkdir/include/asm-ppc64/uaccess.h 2005-09-08 10:07:30.000000000 -0400
+++ RC14-rc2-git6-ppc64-user/include/asm-ppc64/uaccess.h 2005-09-28 13:02:25.000000000 -0400
@@ -164,7 +164,8 @@
#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 @@
#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)) \
More information about the Linuxppc64-dev
mailing list