1 files changed, 6 insertions, 5 deletions

diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
index 103bedc59644..4f3fb6ccbf21 100644
--- a/arch/ia64/include/asm/uaccess.h
+++ b/arch/ia64/include/asm/uaccess.h
@@ -169,10 +169,11 @@ do {									\
         (err) = ia64_getreg(_IA64_REG_R8);                              \
         (val) = ia64_getreg(_IA64_REG_R9);                              \
 } while (0)
-# define __put_user_size(val, addr, n, err)                                                     \
-do {                                                                                            \
-        __st_user("__ex_table", (unsigned long) addr, n, RELOC_TYPE, (unsigned long) (val));    \
-        (err) = ia64_getreg(_IA64_REG_R8);                                                      \
+# define __put_user_size(val, addr, n, err)                             \
+do {                                                                    \
+        __st_user("__ex_table", (unsigned long) addr, n, RELOC_TYPE,    \
+                  (__force unsigned long) (val));                       \
+        (err) = ia64_getreg(_IA64_REG_R8);                              \
 } while (0)
 #endif /* !ASM_SUPPORTED */
 
@@ -197,7 +198,7 @@ extern void __get_user_unknown (void);
                       case 8: __get_user_size(__gu_val, __gu_ptr, 8, __gu_err); break;  \
                       default: __get_user_unknown(); break;                             \
                 }                                                                       \
-        (x) = (__typeof__(*(__gu_ptr))) __gu_val;                                       \
+        (x) = (__force __typeof__(*(__gu_ptr))) __gu_val;                               \
         __gu_err;                                                                       \
 })