From: Dominik Brodowski <linux@dominikbrodowski.de>
Use do_div on 32-bit archs in cpufreq_scale, and native "/" on 64-bit
archs.
---
25-akpm/include/linux/cpufreq.h | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff -puN include/linux/cpufreq.h~cpufreq_scale-fix-cleanup include/linux/cpufreq.h
--- 25/include/linux/cpufreq.h~cpufreq_scale-fix-cleanup Mon Feb 9 11:27:38 2004
+++ 25-akpm/include/linux/cpufreq.h Mon Feb 9 11:27:38 2004
@@ -110,24 +110,24 @@ struct cpufreq_freqs {
* @div: divisor
* @mult: multiplier
*
- * Needed for loops_per_jiffy and similar calculations. We do it
- * this way to avoid math overflow on 32-bit machines. This will
- * become architecture dependent once high-resolution-timer is
- * merged (or any other thing that introduces sc_math.h).
*
* new = old * mult / div
*/
static inline unsigned long cpufreq_scale(unsigned long old, u_int div, u_int mult)
{
- unsigned long val, carry;
+#if BITS_PER_LONG == 32
- mult /= 100;
- div /= 100;
- val = (old / div) * mult;
- carry = old % div;
- carry = carry * mult / div;
+ u64 result = ((u64) old) * ((u64) mult);
+ do_div(result, div);
+ return (unsigned long) result;
- return carry + val;
+#elif BITS_PER_LONG == 64
+
+ unsigned long result = old * ((u64) mult);
+ result /= div;
+ return result;
+
+#endif
};
/*********************************************************************
_