1 files changed, 6 insertions, 3 deletions

diff --git a/include/asm-mips/uaccess.h b/include/asm-mips/uaccess.h
index 91d813a37823..b96f3e0f3933 100644
--- a/include/asm-mips/uaccess.h
+++ b/include/asm-mips/uaccess.h
@@ -233,7 +233,7 @@ do {									\
 #define __get_user_check(x,ptr,size)                                    \
 ({                                                                      \
         long __gu_err = -EFAULT;                                        \
-        const void __user * __gu_ptr = (ptr);                           \
+        const __typeof__(*(ptr)) __user * __gu_ptr = (ptr);             \
                                                                         \
         if (likely(access_ok(VERIFY_READ,  __gu_ptr, size)))            \
                 __get_user_common((x), size, __gu_ptr);                 \
@@ -258,7 +258,7 @@ do {									\
         : "=r" (__gu_err), "=r" (__gu_tmp)                              \
         : "0" (0), "o" (__m(addr)), "i" (-EFAULT));                     \
                                                                         \
-        (val) = (__typeof__(val)) __gu_tmp;                             \
+        (val) = (__typeof__(*(addr))) __gu_tmp;                         \
 }
 
 /*
@@ -266,6 +266,8 @@ do {									\
  */
 #define __get_user_asm_ll32(val, addr)                                  \
 {                                                                       \
+        unsigned long long __gu_tmp;                                    \
+                                                                        \
         __asm__ __volatile__(                                           \
         "1:     lw      %1, (%3)                                \n"     \
         "2:     lw      %D1, 4(%3)                              \n"     \
@@ -280,8 +282,9 @@ do {									\
         "       " __UA_ADDR "   1b, 4b                          \n"     \
         "       " __UA_ADDR "   2b, 4b                          \n"     \
         "       .previous                                       \n"     \
-        : "=r" (__gu_err), "=&r" (val)                                  \
+        : "=r" (__gu_err), "=&r" (__gu_tmp)                             \
         : "0" (0), "r" (addr), "i" (-EFAULT));                          \
+        (val) = (__typeof__(*(addr))) __gu_tmp;                         \
 }
 
 /*