From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 13 Feb 2007 11:45:24 +0000 (+0000)
Subject: [MIPS] 32-bit: Fix warning about cast for fetching pointer from userspace.
X-Git-Tag: v2.6.21-rc1~273^2~5^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cb66fb3f156b485b22db97db22e96db4786dc68b;p=linux-2.6-omap-h63xx.git

[MIPS] 32-bit: Fix warning about cast for fetching pointer from userspace.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/include/asm-mips/uaccess.h b/include/asm-mips/uaccess.h
index c12ebc53ef3..36b3a427f12 100644
--- a/include/asm-mips/uaccess.h
+++ b/include/asm-mips/uaccess.h
@@ -265,7 +265,10 @@ do {									\
  */
 #define __get_user_asm_ll32(val, addr)					\
 {									\
-        unsigned long long __gu_tmp;					\
+	union {								\
+		unsigned long long	l;				\
+		__typeof__(*(addr))	t;				\
+	} __gu_tmp;							\
 									\
 	__asm__ __volatile__(						\
 	"1:	lw	%1, (%3)				\n"	\
@@ -281,9 +284,10 @@ do {									\
 	"	" __UA_ADDR "	1b, 4b				\n"	\
 	"	" __UA_ADDR "	2b, 4b				\n"	\
 	"	.previous					\n"	\
-	: "=r" (__gu_err), "=&r" (__gu_tmp)				\
+	: "=r" (__gu_err), "=&r" (__gu_tmp.l)				\
 	: "0" (0), "r" (addr), "i" (-EFAULT));				\
-	(val) = (__typeof__(*(addr))) __gu_tmp;				\
+									\
+	(val) = __gu_tmp.t;						\
 }
 
 /*