---

yaml --- r: 20295 b: refs/heads/master c: 3218357 h: refs/heads/master i: 20293: 872ceeb 20291: 6b4d8eb 20287: db79bcd v: v3
git-mirror · Feb 14, 2006 · 542f308 · 542f308
1 parent 27d88dc
commit 542f308
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41700e73995d6c814932cb55e12525bd34be1ca5
+refs/heads/master: 3218357c94af92478ef39163163a81e654385320
diff --git a/trunk/include/asm-mips/uaccess.h b/trunk/include/asm-mips/uaccess.h
@@ -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) = __gu_tmp;						\
 }
 
 /*