From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 12 Feb 2007 23:12:38 +0000 (+0000)
Subject: Revert "[MIPS] Fix warning in get_user when fetching pointer object from userspace."
X-Git-Tag: v2.6.21-rc1~273^2~5^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cd1fb9eabea38489579284e0cae0c7019b77b10f;p=linux-2.6-omap-h63xx.git

Revert "[MIPS] Fix warning in get_user when fetching pointer object from userspace."

This reverts commit 4ed3a77f38c023658784804cb39a7ce18063dc88.
---

diff --git a/include/asm-mips/uaccess.h b/include/asm-mips/uaccess.h
index 825fcbd9eab..c12ebc53ef3 100644
--- a/include/asm-mips/uaccess.h
+++ b/include/asm-mips/uaccess.h
@@ -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;				\
 }
 
 /*