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

Commit 92acb6c2 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

cris/uaccess: fix sparse errors 



virtio wants to read bitwise types from userspace using get_user.  At the
moment this triggers sparse errors, since the value is passed through an
integer.

Fix that up using __force.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent f5e0c47e

arch/cris/include/asm/uaccess.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -153,7 +153,7 @@ struct __large_struct { unsigned long buf[100]; }; 
({								\

({								\

	long __gu_err, __gu_val;				\

	long __gu_err, __gu_val;				\

	__get_user_size(__gu_val,(ptr),(size),__gu_err);	\

	__get_user_size(__gu_val,(ptr),(size),__gu_err);	\

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

	(x) = (__force __typeof__(*(ptr)))__gu_val;		\

	__gu_err;						\

	__gu_err;						\

})

})
@@ -163,7 +163,7 @@ struct __large_struct { unsigned long buf[100]; }; 
	const __typeof__(*(ptr)) *__gu_addr = (ptr);			\

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

	if (access_ok(VERIFY_READ,__gu_addr,size))			\

	if (access_ok(VERIFY_READ,__gu_addr,size))			\

		__get_user_size(__gu_val,__gu_addr,(size),__gu_err);	\

		__get_user_size(__gu_val,__gu_addr,(size),__gu_err);	\

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

	(x) = (__force __typeof__(*(ptr)))__gu_val;			\

	__gu_err;							\

	__gu_err;							\

})

})