Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / nios2 / include / asm / uaccess.h

diff --git a/arch/nios2/include/asm/uaccess.h b/arch/nios2/include/asm/uaccess.h
index acedc0a..caa51ff 100644 (file)
--- a/arch/nios2/include/asm/uaccess.h
+++ b/arch/nios2/include/asm/uaccess.h
@@ -168,7 +168,7 @@ do {                                                                        \
        const __typeof__(*(ptr)) __user *__gu_ptr = (ptr);              \
        unsigned long __gu_val;                                         \
        __get_user_common(__gu_val, sizeof(*(ptr)), __gu_ptr, __gu_err);\
-       (x) = (__typeof__(x))__gu_val;                                  \
+       (x) = (__force __typeof__(x))__gu_val;                          \
        __gu_err;                                                       \
        })
 
@@ -180,7 +180,7 @@ do {                                                                        \
        if (access_ok(VERIFY_READ,  __gu_ptr, sizeof(*__gu_ptr)))       \
                __get_user_common(__gu_val, sizeof(*__gu_ptr),          \
                        __gu_ptr, __gu_err);                            \
-       (x) = (__typeof__(x))__gu_val;                                  \
+       (x) = (__force __typeof__(x))__gu_val;                          \
        __gu_err;                                                       \
 })