]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Revert "[MIPS] Fix warning in get_user when fetching pointer object from userspace."
authorRalf Baechle <ralf@linux-mips.org>
Mon, 12 Feb 2007 23:12:38 +0000 (23:12 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 13 Feb 2007 22:40:50 +0000 (22:40 +0000)
This reverts commit 4ed3a77f38c023658784804cb39a7ce18063dc88.

include/asm-mips/uaccess.h

index 825fcbd9eabd30e0924002bc3a039ae2ace4d5ab..c12ebc53ef317f4ac6bcd146736b65bde0f4243f 100644 (file)
@@ -265,6 +265,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"     \
@@ -279,8 +281,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;                         \
 }
 
 /*