diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 14:56:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 14:56:31 -0700 |
commit | 0279b3c0ada1d78882f24acf94ac4595bd657a89 (patch) | |
tree | ba31505ea6581b840604493d0233857bb7ce58d1 /include | |
parent | 797994f81a8b2bdca2eecffa415c1e7a89a4f961 (diff) | |
parent | f3002134158092178be81339ec5a22ff80e6c308 (diff) | |
download | op-kernel-dev-0279b3c0ada1d78882f24acf94ac4595bd657a89.zip op-kernel-dev-0279b3c0ada1d78882f24acf94ac4595bd657a89.tar.gz |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"This fixes the cputime scaling overflow problems for good without
having bad 32-bit overhead, and gets rid of the div64_u64_rem() helper
as well."
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert "math64: New div64_u64_rem helper"
sched: Avoid prev->stime underflow
sched: Do not account bogus utime
sched: Avoid cputime scaling overflow
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/math64.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/include/linux/math64.h b/include/linux/math64.h index 931a619..b8ba855 100644 --- a/include/linux/math64.h +++ b/include/linux/math64.h @@ -30,15 +30,6 @@ static inline s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder) } /** - * 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 */ static inline u64 div64_u64(u64 dividend, u64 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 |