aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mips/uaccess.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-02-12 18:12:38 -0500
committerRalf Baechle <ralf@linux-mips.org>2007-02-13 17:40:50 -0500
commitcd1fb9eabea38489579284e0cae0c7019b77b10f (patch)
treed736af91b29ee62a64b97e47b6dddaa964826085 /include/asm-mips/uaccess.h
parent84b47a959b55930e86d6178d49769bc9ba34bce1 (diff)
Revert "[MIPS] Fix warning in get_user when fetching pointer object from userspace."
This reverts commit 4ed3a77f38c023658784804cb39a7ce18063dc88.
Diffstat (limited to 'include/asm-mips/uaccess.h')
-rw-r--r--include/asm-mips/uaccess.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-mips/uaccess.h b/include/asm-mips/uaccess.h
index 825fcbd9eabd..c12ebc53ef31 100644
--- a/include/asm-mips/uaccess.h
+++ b/include/asm-mips/uaccess.h
@@ -265,6 +265,8 @@ do { \
265 */ 265 */
266#define __get_user_asm_ll32(val, addr) \ 266#define __get_user_asm_ll32(val, addr) \
267{ \ 267{ \
268 unsigned long long __gu_tmp; \
269 \
268 __asm__ __volatile__( \ 270 __asm__ __volatile__( \
269 "1: lw %1, (%3) \n" \ 271 "1: lw %1, (%3) \n" \
270 "2: lw %D1, 4(%3) \n" \ 272 "2: lw %D1, 4(%3) \n" \
@@ -279,8 +281,9 @@ do { \
279 " " __UA_ADDR " 1b, 4b \n" \ 281 " " __UA_ADDR " 1b, 4b \n" \
280 " " __UA_ADDR " 2b, 4b \n" \ 282 " " __UA_ADDR " 2b, 4b \n" \
281 " .previous \n" \ 283 " .previous \n" \
282 : "=r" (__gu_err), "=&r" (val) \ 284 : "=r" (__gu_err), "=&r" (__gu_tmp) \
283 : "0" (0), "r" (addr), "i" (-EFAULT)); \ 285 : "0" (0), "r" (addr), "i" (-EFAULT)); \
286 (val) = (__typeof__(*(addr))) __gu_tmp; \
284} 287}
285 288
286/* 289/*