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

Commit 9b7accb2 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

sparc32/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>

Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cad1c0df

arch/sparc/include/asm/uaccess_32.h

+4 −4
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ case 2: __get_user_asm(__gu_val,uh,addr,__gu_ret); break; \ 
case 4: __get_user_asm(__gu_val,,addr,__gu_ret); break; \

case 8: __get_user_asm(__gu_val,d,addr,__gu_ret); break; \

default: __gu_val = 0; __gu_ret = __get_user_bad(); break; \

} } else { __gu_val = 0; __gu_ret = -EFAULT; } x = (type) __gu_val; __gu_ret; })

} } else { __gu_val = 0; __gu_ret = -EFAULT; } x = (__force type) __gu_val; __gu_ret; })



#define __get_user_check_ret(x,addr,size,type,retval) ({ \

register unsigned long __gu_val __asm__ ("l1"); \
@@ -175,7 +175,7 @@ case 2: __get_user_asm_ret(__gu_val,uh,addr,retval); break; \ 
case 4: __get_user_asm_ret(__gu_val,,addr,retval); break; \

case 8: __get_user_asm_ret(__gu_val,d,addr,retval); break; \

default: if (__get_user_bad()) return retval; \

} x = (type) __gu_val; } else return retval; })

} x = (__force type) __gu_val; } else return retval; })



#define __get_user_nocheck(x,addr,size,type) ({ \

register int __gu_ret; \
@@ -186,7 +186,7 @@ case 2: __get_user_asm(__gu_val,uh,addr,__gu_ret); break; \ 
case 4: __get_user_asm(__gu_val,,addr,__gu_ret); break; \

case 8: __get_user_asm(__gu_val,d,addr,__gu_ret); break; \

default: __gu_val = 0; __gu_ret = __get_user_bad(); break; \

} x = (type) __gu_val; __gu_ret; })

} x = (__force type) __gu_val; __gu_ret; })



#define __get_user_nocheck_ret(x,addr,size,type,retval) ({ \

register unsigned long __gu_val __asm__ ("l1"); \
@@ -196,7 +196,7 @@ case 2: __get_user_asm_ret(__gu_val,uh,addr,retval); break; \ 
case 4: __get_user_asm_ret(__gu_val,,addr,retval); break; \

case 8: __get_user_asm_ret(__gu_val,d,addr,retval); break; \

default: if (__get_user_bad()) return retval; \

} x = (type) __gu_val; })

} x = (__force type) __gu_val; })



#define __get_user_asm(x,size,addr,ret)					\

__asm__ __volatile__(							\