Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3002134 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Ingo Molnar
Browse files

Revert "math64: New div64_u64_rem helper" 



This reverts commit f7926850.

The cputime scaling code was changed/fixed and does not need the
div64_u64_rem() primitive anymore. It has no other users, so let's
remove them.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: rostedt@goodmis.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Dave Hansen <dave@sr71.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1367314507-9728-4-git-send-email-sgruszka@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 68aa8efc

include/linux/math64.h

+1 −18
Original line number Diff line number Diff line
@@ -29,15 +29,6 @@ static inline s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder) 
	return dividend / divisor;

}



/**

 * div64_u64_rem - unsigned 64bit divide with 64bit divisor

 */

static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)

{

	*remainder = dividend % divisor;

	return dividend / divisor;

}



/**

 * div64_u64 - unsigned 64bit divide with 64bit divisor

 */
@@ -70,16 +61,8 @@ static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder) 
extern s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder);

#endif



#ifndef div64_u64_rem

extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);

#endif



#ifndef div64_u64

static inline u64 div64_u64(u64 dividend, u64 divisor)

{

	u64 remainder;

	return div64_u64_rem(dividend, divisor, &remainder);

}

extern u64 div64_u64(u64 dividend, u64 divisor);

#endif



#ifndef div64_s64

lib/div64.c

+6 −13
Original line number Diff line number Diff line
@@ -79,10 +79,9 @@ EXPORT_SYMBOL(div_s64_rem); 
#endif



/**

 * div64_u64_rem - unsigned 64bit divide with 64bit divisor and 64bit remainder

 * div64_u64 - unsigned 64bit divide with 64bit divisor

 * @dividend:	64bit dividend

 * @divisor:	64bit divisor

 * @remainder:  64bit remainder

 *

 * This implementation is a modified version of the algorithm proposed

 * by the book 'Hacker's Delight'.  The original source and full proof
@@ -90,33 +89,27 @@ EXPORT_SYMBOL(div_s64_rem); 
 *

 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'

 */

#ifndef div64_u64_rem

u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)

#ifndef div64_u64

u64 div64_u64(u64 dividend, u64 divisor)

{

	u32 high = divisor >> 32;

	u64 quot;



	if (high == 0) {

		u32 rem32;

		quot = div_u64_rem(dividend, divisor, &rem32);

		*remainder = rem32;

		quot = div_u64(dividend, divisor);

	} else {

		int n = 1 + fls(high);

		quot = div_u64(dividend >> n, divisor >> n);



		if (quot != 0)

			quot--;



		*remainder = dividend - quot * divisor;

		if (*remainder >= divisor) {

		if ((dividend - quot * divisor) >= divisor)

			quot++;

			*remainder -= divisor;

		}

	}



	return quot;

}

EXPORT_SYMBOL(div64_u64_rem);

EXPORT_SYMBOL(div64_u64);

#endif



/**