diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2014-12-11 18:56:04 -0500 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2015-01-13 08:23:17 -0500 |
commit | 582a6783c56517b84a06da72e18e1e44a59558e6 (patch) | |
tree | fe72ab19cd4b5b35d214f5849f55591e3c07384e | |
parent | 8f4e4c1aef356ac4ce67caeffac29af4971fe048 (diff) |
openrisc/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: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r-- | arch/openrisc/include/asm/uaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/openrisc/include/asm/uaccess.h b/arch/openrisc/include/asm/uaccess.h index ab2e7a198a4c..a6bd07ca3d6c 100644 --- a/arch/openrisc/include/asm/uaccess.h +++ b/arch/openrisc/include/asm/uaccess.h | |||
@@ -192,7 +192,7 @@ struct __large_struct { | |||
192 | ({ \ | 192 | ({ \ |
193 | long __gu_err, __gu_val; \ | 193 | long __gu_err, __gu_val; \ |
194 | __get_user_size(__gu_val, (ptr), (size), __gu_err); \ | 194 | __get_user_size(__gu_val, (ptr), (size), __gu_err); \ |
195 | (x) = (__typeof__(*(ptr)))__gu_val; \ | 195 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ |
196 | __gu_err; \ | 196 | __gu_err; \ |
197 | }) | 197 | }) |
198 | 198 | ||
@@ -202,7 +202,7 @@ struct __large_struct { | |||
202 | const __typeof__(*(ptr)) * __gu_addr = (ptr); \ | 202 | const __typeof__(*(ptr)) * __gu_addr = (ptr); \ |
203 | if (access_ok(VERIFY_READ, __gu_addr, size)) \ | 203 | if (access_ok(VERIFY_READ, __gu_addr, size)) \ |
204 | __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \ | 204 | __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \ |
205 | (x) = (__typeof__(*(ptr)))__gu_val; \ | 205 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ |
206 | __gu_err; \ | 206 | __gu_err; \ |
207 | }) | 207 | }) |
208 | 208 | ||