From 82cfde84f81808c620c49635e4e72b1069f54bda Mon Sep 17 00:00:00 2001
From: George Spelvin <linux@horizon.com>
Date: Thu, 4 Oct 2012 17:12:30 -0700
Subject: [PATCH] --- yaml --- r: 330064 b: refs/heads/master c:
 cb239d0a97d573150d6106a92c0641da0d03f6a1 h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/lib/vsprintf.c | 22 ++++++----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 9ee459bdb41b..7020599e1c24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2359172a75986359ce9cf041a9aca6a32cdf8779
+refs/heads/master: cb239d0a97d573150d6106a92c0641da0d03f6a1
diff --git a/trunk/lib/vsprintf.c b/trunk/lib/vsprintf.c
index 8cb7635b2ce3..c2236f14640f 100644
--- a/trunk/lib/vsprintf.c
+++ b/trunk/lib/vsprintf.c
@@ -174,22 +174,12 @@ char *put_dec_trunc8(char *buf, unsigned r)
 	unsigned q;
 
 	/* Copy of previous function's body with added early returns */
-	q      = (r * (uint64_t)0x1999999a) >> 32;
-	*buf++ = (r - 10 * q) + '0'; /* 2 */
-	if (q == 0)
-		return buf;
-	r      = (q * (uint64_t)0x1999999a) >> 32;
-	*buf++ = (q - 10 * r) + '0'; /* 3 */
-	if (r == 0)
-		return buf;
-	q      = (r * (uint64_t)0x1999999a) >> 32;
-	*buf++ = (r - 10 * q) + '0'; /* 4 */
-	if (q == 0)
-		return buf;
-	r      = (q * (uint64_t)0x1999999a) >> 32;
-	*buf++ = (q - 10 * r) + '0'; /* 5 */
-	if (r == 0)
-		return buf;
+	while (r >= 10000) {
+		q = r + '0';
+		r  = (r * (uint64_t)0x1999999a) >> 32;
+		*buf++ = q - 10*r;
+	}
+
 	q      = (r * 0x199a) >> 16;
 	*buf++ = (r - 10 * q)  + '0'; /* 6 */
 	if (q == 0)