From 84b9ced6b3a3f43e4807e94fd78658a8439c24b4 Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Wed, 11 Jul 2007 00:24:14 +0900
Subject: [PATCH] --- yaml --- r: 58679 b: refs/heads/master c:
 7e95a016f844fc660bf80065413998a784a78988 h: refs/heads/master i:   58677:
 6b6f2695f94d3e9db88c0b4bbf01a15577342ce4   58675:
 ab97c5c69d75fbca10d8103f43831a2f6246cfd6   58671:
 af4a5288c88f0e7ccbe4ec6c480be48108c6ee22 v: v3

---
 [refs]                         | 2 +-
 trunk/include/asm-mips/div64.h | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 32cf0e4b1b39..c876f0ab6f01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62b396358e837549f20068ed9c3d2bcf99d9ad2d
+refs/heads/master: 7e95a016f844fc660bf80065413998a784a78988
diff --git a/trunk/include/asm-mips/div64.h b/trunk/include/asm-mips/div64.h
index 66189f5f6399..716371bd0980 100644
--- a/trunk/include/asm-mips/div64.h
+++ b/trunk/include/asm-mips/div64.h
@@ -20,7 +20,7 @@
  */
 
 #define do_div64_32(res, high, low, base) ({ \
-	unsigned long __quot, __mod; \
+	unsigned long __quot32, __mod32; \
 	unsigned long __cf, __tmp, __tmp2, __i; \
 	\
 	__asm__(".set	push\n\t" \
@@ -48,12 +48,13 @@
 		"bnez	%4, 0b\n\t" \
 		" srl	%5, %1, 0x1f\n\t" \
 		".set	pop" \
-		: "=&r" (__mod), "=&r" (__tmp), "=&r" (__quot), "=&r" (__cf), \
+		: "=&r" (__mod32), "=&r" (__tmp), \
+		  "=&r" (__quot32), "=&r" (__cf), \
 		  "=&r" (__i), "=&r" (__tmp2) \
 		: "Jr" (base), "0" (high), "1" (low)); \
 	\
-	(res) = __quot; \
-	__mod; })
+	(res) = __quot32; \
+	__mod32; })
 
 #define do_div(n, base) ({ \
 	unsigned long long __quot; \