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:21 -0500 |
commit | cad1c0dfc8961abeb92e5afbfa275b6122501e5f (patch) | |
tree | 260b73d0c10d33b9678d9dae8c4c3e99ce59870b /arch/sh | |
parent | 079f0f269f2a64080d7fa45cf686b02662ff8e36 (diff) |
sh/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>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/include/asm/uaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/uaccess.h b/arch/sh/include/asm/uaccess.h index 9486376605f4..a49635c51266 100644 --- a/arch/sh/include/asm/uaccess.h +++ b/arch/sh/include/asm/uaccess.h | |||
@@ -60,7 +60,7 @@ struct __large_struct { unsigned long buf[100]; }; | |||
60 | const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ | 60 | const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ |
61 | __chk_user_ptr(ptr); \ | 61 | __chk_user_ptr(ptr); \ |
62 | __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \ | 62 | __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \ |
63 | (x) = (__typeof__(*(ptr)))__gu_val; \ | 63 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ |
64 | __gu_err; \ | 64 | __gu_err; \ |
65 | }) | 65 | }) |
66 | 66 | ||
@@ -71,7 +71,7 @@ struct __large_struct { unsigned long buf[100]; }; | |||
71 | const __typeof__(*(ptr)) *__gu_addr = (ptr); \ | 71 | const __typeof__(*(ptr)) *__gu_addr = (ptr); \ |
72 | if (likely(access_ok(VERIFY_READ, __gu_addr, (size)))) \ | 72 | if (likely(access_ok(VERIFY_READ, __gu_addr, (size)))) \ |
73 | __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \ | 73 | __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \ |
74 | (x) = (__typeof__(*(ptr)))__gu_val; \ | 74 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ |
75 | __gu_err; \ | 75 | __gu_err; \ |
76 | }) | 76 | }) |
77 | 77 | ||