Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea8a918e authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] ppc64 get_user annotations 



long is not uintptr_t, unsigned long is.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c2814476

include/asm-ppc64/uaccess.h

+4 −2
Original line number Diff line number Diff line
@@ -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))			\