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

Commit 64a978c1 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: be more explicit in __put_user_x. 



For both __put_user_x and __put_user_8 macros, pass the error
variable explicitly.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3f168221

include/asm-x86/uaccess_32.h

+7 −7
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ extern void __put_user_2(void); 
extern void __put_user_4(void);

extern void __put_user_8(void);



#define __put_user_x(size, x, ptr)				\

#define __put_user_x(size, x, ptr, __ret_pu)			\

	asm volatile("call __put_user_" #size : "=a" (__ret_pu)	\

		     :"0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")



#define __put_user_8(x, ptr)					\

#define __put_user_8(x, ptr, __ret_pu)				\

	asm volatile("call __put_user_8" : "=a" (__ret_pu)	\

		     : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
@@ -66,19 +66,19 @@ extern void __put_user_8(void); 
	__pu_val = x;						\

	switch (sizeof(*(ptr))) {				\

	case 1:							\

		__put_user_x(1, __pu_val, ptr);			\

		__put_user_x(1, __pu_val, ptr, __ret_pu);	\

		break;						\

	case 2:							\

		__put_user_x(2, __pu_val, ptr);			\

		__put_user_x(2, __pu_val, ptr, __ret_pu);	\

		break;						\

	case 4:							\

		__put_user_x(4, __pu_val, ptr);			\

		__put_user_x(4, __pu_val, ptr, __ret_pu);	\

		break;						\

	case 8:							\

		__put_user_8(__pu_val, ptr);			\

		__put_user_8(__pu_val, ptr, __ret_pu);		\

		break;						\

	default:						\

		__put_user_x(X, __pu_val, ptr);			\

		__put_user_x(X, __pu_val, ptr, __ret_pu);	\

		break;						\

	}							\

	__ret_pu;						\