diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2015-01-27 11:20:10 -0500 |
---|---|---|
committer | Jesper Nilsson <jespern@axis.com> | 2015-02-14 12:53:52 -0500 |
commit | 458e3192455547bb4dce27e060c24cc22a2bd87d (patch) | |
tree | 4dab6f4b2435783415b2f51087af45f970f70f2d /arch/cris | |
parent | 10b309767271cf05442d48b38dbe0f79ee8cfb74 (diff) |
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: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/include/asm/uaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/include/asm/uaccess.h b/arch/cris/include/asm/uaccess.h index 914540801c5e..9cf5a23baed3 100644 --- a/arch/cris/include/asm/uaccess.h +++ b/arch/cris/include/asm/uaccess.h | |||
@@ -153,7 +153,7 @@ struct __large_struct { unsigned long buf[100]; }; | |||
153 | ({ \ | 153 | ({ \ |
154 | long __gu_err, __gu_val; \ | 154 | long __gu_err, __gu_val; \ |
155 | __get_user_size(__gu_val,(ptr),(size),__gu_err); \ | 155 | __get_user_size(__gu_val,(ptr),(size),__gu_err); \ |
156 | (x) = (__typeof__(*(ptr)))__gu_val; \ | 156 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ |
157 | __gu_err; \ | 157 | __gu_err; \ |
158 | }) | 158 | }) |
159 | 159 | ||
@@ -163,7 +163,7 @@ struct __large_struct { unsigned long buf[100]; }; | |||
163 | const __typeof__(*(ptr)) *__gu_addr = (ptr); \ | 163 | const __typeof__(*(ptr)) *__gu_addr = (ptr); \ |
164 | if (access_ok(VERIFY_READ,__gu_addr,size)) \ | 164 | if (access_ok(VERIFY_READ,__gu_addr,size)) \ |
165 | __get_user_size(__gu_val,__gu_addr,(size),__gu_err); \ | 165 | __get_user_size(__gu_val,__gu_addr,(size),__gu_err); \ |
166 | (x) = (__typeof__(*(ptr)))__gu_val; \ | 166 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ |
167 | __gu_err; \ | 167 | __gu_err; \ |
168 | }) | 168 | }) |
169 | 169 | ||