diff options
| author | Pallipadi, Venkatesh <venkatesh.pallipadi@intel.com> | 2009-11-11 16:50:29 -0800 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2009-11-17 23:15:04 -0500 |
| commit | 54c9a35d9faef06e00e2a941eb8fe674f1886901 (patch) | |
| tree | 928bbd03871e60f79edd0dd522ac48a598d17cb6 /drivers/cpufreq | |
| parent | 8dca15e40889e5d5e9655b03ba79c26200f760ce (diff) | |
| download | kernel_samsung_aries-54c9a35d9faef06e00e2a941eb8fe674f1886901.zip kernel_samsung_aries-54c9a35d9faef06e00e2a941eb8fe674f1886901.tar.gz kernel_samsung_aries-54c9a35d9faef06e00e2a941eb8fe674f1886901.tar.bz2 | |
[CPUFREQ] Resolve time unit thinko in ondemand/conservative govs
ondemand and conservative governors are messing up time units in the
code path where NO_HZ is not enabled and ignore_nice is set. The walltime
idletime stored is in jiffies and nice time calculation is happening in
microseconds.
The problem was reported and diagnosed by Alexander here.
http://marc.info/?l=linux-kernel&m=125752550404513&w=2
The patch below fixes this thinko.
Reported-by: Alexander Miller <Miller@fmi.uni-stuttgart.de>
Tested-by: Alexander Miller <Miller@fmi.uni-stuttgart.de>
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq_conservative.c | 4 | ||||
| -rw-r--r-- | drivers/cpufreq/cpufreq_ondemand.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index bc33ddc..c7b081b 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -116,9 +116,9 @@ static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu, idle_time = cputime64_sub(cur_wall_time, busy_time); if (wall) - *wall = cur_wall_time; + *wall = (cputime64_t)jiffies_to_usecs(cur_wall_time); - return idle_time; + return (cputime64_t)jiffies_to_usecs(idle_time);; } static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 071699d..4b34ade 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -133,9 +133,9 @@ static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu, idle_time = cputime64_sub(cur_wall_time, busy_time); if (wall) - *wall = cur_wall_time; + *wall = (cputime64_t)jiffies_to_usecs(cur_wall_time); - return idle_time; + return (cputime64_t)jiffies_to_usecs(idle_time); } static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) |