mirror of
https://github.com/adulau/aha.git
synced 2025-01-01 13:46:24 +00:00
[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>
This commit is contained in:
parent
c28144763a
commit
ea8a918eb7
1 changed files with 4 additions and 2 deletions
|
@ -164,7 +164,8 @@ do { \
|
||||||
|
|
||||||
#define __get_user_nocheck(x,ptr,size) \
|
#define __get_user_nocheck(x,ptr,size) \
|
||||||
({ \
|
({ \
|
||||||
long __gu_err, __gu_val; \
|
long __gu_err; \
|
||||||
|
unsigned long __gu_val; \
|
||||||
might_sleep(); \
|
might_sleep(); \
|
||||||
__get_user_size(__gu_val,(ptr),(size),__gu_err,-EFAULT);\
|
__get_user_size(__gu_val,(ptr),(size),__gu_err,-EFAULT);\
|
||||||
(x) = (__typeof__(*(ptr)))__gu_val; \
|
(x) = (__typeof__(*(ptr)))__gu_val; \
|
||||||
|
@ -173,7 +174,8 @@ do { \
|
||||||
|
|
||||||
#define __get_user_check(x,ptr,size) \
|
#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); \
|
const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
|
||||||
might_sleep(); \
|
might_sleep(); \
|
||||||
if (access_ok(VERIFY_READ,__gu_addr,size)) \
|
if (access_ok(VERIFY_READ,__gu_addr,size)) \
|
||||||
|
|
Loading…
Reference in a new issue