]> git.karo-electronics.de Git - linux-beck.git/commitdiff
sh/uaccess: fix sparse errors
authorMichael S. Tsirkin <mst@redhat.com>
Thu, 11 Dec 2014 23:56:04 +0000 (01:56 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Tue, 13 Jan 2015 13:23:21 +0000 (15:23 +0200)
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>
arch/sh/include/asm/uaccess.h

index 9486376605f4dc21c5c6a36f1a84df06810b8f28..a49635c512665ddc6b9e70e5d944c57e26d349d6 100644 (file)
@@ -60,7 +60,7 @@ struct __large_struct { unsigned long buf[100]; };
        const __typeof__(*(ptr)) __user *__gu_addr = (ptr);     \
        __chk_user_ptr(ptr);                                    \
        __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
-       (x) = (__typeof__(*(ptr)))__gu_val;                     \
+       (x) = (__force __typeof__(*(ptr)))__gu_val;             \
        __gu_err;                                               \
 })
 
@@ -71,7 +71,7 @@ struct __large_struct { unsigned long buf[100]; };
        const __typeof__(*(ptr)) *__gu_addr = (ptr);                    \
        if (likely(access_ok(VERIFY_READ, __gu_addr, (size))))          \
                __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
-       (x) = (__typeof__(*(ptr)))__gu_val;                             \
+       (x) = (__force __typeof__(*(ptr)))__gu_val;                     \
        __gu_err;                                                       \
 })