diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-10-24 22:16:34 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-15 00:33:07 +0100 |
| commit | 8636fd280e970696be62c8495a5aacb5f3b6237d (patch) | |
| tree | 654bc5707fde353a8fdbdf6121d4c54cadd51440 | |
| parent | db7011516cbfc3d867b77721f77258d36cfbf705 (diff) | |
| download | linux-3.10-8636fd280e970696be62c8495a5aacb5f3b6237d.tar.gz linux-3.10-8636fd280e970696be62c8495a5aacb5f3b6237d.tar.bz2 linux-3.10-8636fd280e970696be62c8495a5aacb5f3b6237d.zip | |
cpufreq: fix jiffies/cputime mixup in conservative/ondemand governors
The function get_cpu_idle_time_jiffy in both the conservative and
ondemand governors use jiffies_to_usecs to convert a cputime value to
usecs which gives the wrong value on architectures where cputime and
jiffies use different units. Only matters if NO_HZ is disabled, since
otherwise get_cpu_idle_time_us should already return a valid value, and
get_cpu_idle_time_jiffy isn't actually called.
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/cpufreq/cpufreq_governor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c index 0001071cdcd..679842a8d34 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c @@ -33,9 +33,9 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) idle_time = cur_wall_time - busy_time; if (wall) - *wall = jiffies_to_usecs(cur_wall_time); + *wall = cputime_to_usecs(cur_wall_time); - return jiffies_to_usecs(idle_time); + return cputime_to_usecs(idle_time); } cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) |