Skip to contentSkip to conversation

ppc64 get_user annotations

PATCH New Al Viro 1 participant 1 message Sep 28, 2005

lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 ppc64 get_user annotations

long is not uintptr_t, unsigned long is.

----

include/asm-ppc64/uaccess.h +4 -2
diff -urN RC14-rc2-git6-proc_mkdir/include/asm-ppc64/uaccess.h RC14-rc2-git6-ppc64-user/include/asm-ppc64/uaccess.h
@@ -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))			\