Commit 17f8c0bc authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/uaccess: Rename __get/put_user_check/nocheck 



__get_user_check() becomes get_user()
__put_user_check() becomes put_user()
__get_user_nocheck() becomes __get_user()
__put_user_nocheck() becomes __put_user()

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/41d7e45f4733f0e61e63824e4865b4e049db74d6.1615398265.git.christophe.leroy@csgroup.eu
parent f904c22f

arch/powerpc/include/asm/uaccess.h

+10 −20
Original line number Diff line number Diff line
@@ -43,16 +43,6 @@ static inline bool __access_ok(unsigned long addr, unsigned long size) 
 * exception handling means that it's no longer "just"...)

 *

 */

#define get_user(x, ptr) \

	__get_user_check((x), (ptr), sizeof(*(ptr)))

#define put_user(x, ptr) \

	__put_user_check((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))



#define __get_user(x, ptr) \

	__get_user_nocheck((x), (ptr), sizeof(*(ptr)))

#define __put_user(x, ptr) \

	__put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))



#define __put_user_size(x, ptr, size, retval)			\

do {								\

	__label__ __pu_failed;					\
@@ -68,12 +58,12 @@ __pu_failed: \ 
	prevent_write_to_user(ptr, size);			\

} while (0)



#define __put_user_nocheck(x, ptr, size)			\

#define __put_user(x, ptr)					\

({								\

	long __pu_err;						\

	__typeof__(*(ptr)) __user *__pu_addr = (ptr);		\

	__typeof__(*(ptr)) __pu_val = (x);			\

	__typeof__(size) __pu_size = (size);			\

	__typeof__(*(ptr)) __pu_val = (__typeof__(*(ptr)))(x);	\

	__typeof__(sizeof(*(ptr))) __pu_size = sizeof(*(ptr));	\

								\

	might_fault();						\

	__put_user_size(__pu_val, __pu_addr, __pu_size, __pu_err);	\
@@ -81,12 +71,12 @@ __pu_failed: \ 
	__pu_err;						\

})



#define __put_user_check(x, ptr, size)					\

#define put_user(x, ptr)						\

({									\

	long __pu_err = -EFAULT;					\

	__typeof__(*(ptr)) __user *__pu_addr = (ptr);			\

	__typeof__(*(ptr)) __pu_val = (x);				\

	__typeof__(size) __pu_size = (size);				\

	__typeof__(*(ptr)) __pu_val = (__typeof__(*(ptr)))(x);		\

	__typeof__(sizeof(*(ptr))) __pu_size = sizeof(*(ptr));		\

									\

	might_fault();							\

	if (access_ok(__pu_addr, __pu_size))				\
@@ -216,12 +206,12 @@ do { \ 
#define __long_type(x) \

	__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))



#define __get_user_nocheck(x, ptr, size)			\

#define __get_user(x, ptr)					\

({								\

	long __gu_err;						\

	__long_type(*(ptr)) __gu_val;				\

	__typeof__(*(ptr)) __user *__gu_addr = (ptr);	\

	__typeof__(size) __gu_size = (size);			\

	__typeof__(sizeof(*(ptr))) __gu_size = sizeof(*(ptr));	\

								\

	might_fault();					\

	__get_user_size(__gu_val, __gu_addr, __gu_size, __gu_err);	\
@@ -230,12 +220,12 @@ do { \ 
	__gu_err;						\

})



#define __get_user_check(x, ptr, size)					\

#define get_user(x, ptr)						\

({									\

	long __gu_err = -EFAULT;					\

	__long_type(*(ptr)) __gu_val = 0;				\

	__typeof__(*(ptr)) __user *__gu_addr = (ptr);		\

	__typeof__(size) __gu_size = (size);				\

	__typeof__(sizeof(*(ptr))) __gu_size = sizeof(*(ptr));		\

									\

	might_fault();							\

	if (access_ok(__gu_addr, __gu_size))				\