Commit 8cdf748d authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/uaccess: Remove __get_user_allowed() and unsafe_op_wrap() 



Those two macros have only one user which is unsafe_get_user().

Put everything in one place and remove them.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarDaniel Axtens <dja@axtens.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/439179c5e54c18f2cb8bdf1eea13ea0ef6b98375.1615398265.git.christophe.leroy@csgroup.eu
parent 937c49d1

arch/powerpc/include/asm/uaccess.h

+5 −5
Original line number Diff line number Diff line
@@ -53,9 +53,6 @@ static inline bool __access_ok(unsigned long addr, unsigned long size) 
#define __put_user(x, ptr) \

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



#define __get_user_allowed(x, ptr) \

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



#define __get_user_inatomic(x, ptr) \

	__get_user_nosleep((x), (ptr), sizeof(*(ptr)))

#define __put_user_inatomic(x, ptr) \
@@ -481,8 +478,11 @@ user_write_access_begin(const void __user *ptr, size_t len) 
#define user_write_access_begin	user_write_access_begin

#define user_write_access_end		prevent_current_write_to_user



#define unsafe_op_wrap(op, err) do { if (unlikely(op)) goto err; } while (0)

#define unsafe_get_user(x, p, e) unsafe_op_wrap(__get_user_allowed(x, p), e)

#define unsafe_get_user(x, p, e) do {					\

	if (unlikely(__get_user_nocheck((x), (p), sizeof(*(p)), false)))\

		goto e;							\

} while (0)



#define unsafe_put_user(x, p, e) \

	__unsafe_put_user_goto((__typeof__(*(p)))(x), (p), sizeof(*(p)), e)