Skip to content

Commit

Permalink
[PATCH] ppc64 get_user annotations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Sep 29, 2005
1 parent c281447 commit ea8a918
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions include/asm-ppc64/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand All @@ -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)) \
Expand Down

0 comments on commit ea8a918

Please sign in to comment.