X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=lib%2Fdiv64.c;h=74f0c8cb40315f6b985c96a238dbb99b382931d6;hb=22b9a0a3a49ab1a856e0853b3f3dd2abd156bd7c;hp=c3d7655cdfb5537b2b6ef71e09d284827552050a;hpb=c454673da7c1d6533f40ec2f788023df9af56ebf;p=powerpc.git

diff --git a/lib/div64.c b/lib/div64.c
index c3d7655cdf..74f0c8cb40 100644
--- a/lib/div64.c
+++ b/lib/div64.c
@@ -61,20 +61,18 @@ EXPORT_SYMBOL(__div64_32);
 /* 64bit divisor, dividend and result. dynamic precision */
 uint64_t div64_64(uint64_t dividend, uint64_t divisor)
 {
-	uint32_t d = divisor;
+	uint32_t high, d;
 
-	if (divisor > 0xffffffffULL) {
-		unsigned int shift = fls(divisor >> 32);
+	high = divisor >> 32;
+	if (high) {
+		unsigned int shift = fls(high);
 
 		d = divisor >> shift;
 		dividend >>= shift;
-	}
+	} else
+		d = divisor;
 
-	/* avoid 64 bit division if possible */
-	if (dividend >> 32)
-		do_div(dividend, d);
-	else
-		dividend = (uint32_t) dividend / d;
+	do_div(dividend, d);
 
 	return dividend;
 }