diff options
| author | Rafael J. Wysocki | 2013-08-14 22:21:16 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2013-08-14 22:21:16 +0200 |
| commit | c49a089c3eedbc4b3fa9c3d469599a6c14dea4c5 (patch) | |
| tree | 9f21ef73bb2d3b8fad642158c6ffa6e33ccabee3 /drivers/cpufreq/cpufreq_governor.c | |
| parent | Linux 3.11-rc5 (diff) | |
| parent | cpufreq: improve error checking on return values of __cpufreq_governor() (diff) | |
| download | kernel-qcow2-linux-c49a089c3eedbc4b3fa9c3d469599a6c14dea4c5.tar.gz kernel-qcow2-linux-c49a089c3eedbc4b3fa9c3d469599a6c14dea4c5.tar.xz kernel-qcow2-linux-c49a089c3eedbc4b3fa9c3d469599a6c14dea4c5.zip | |
Merge back earlier 'pm-cpufreq' material
Diffstat (limited to 'drivers/cpufreq/cpufreq_governor.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq_governor.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c index e59afaa9da23..87427360c77f 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c @@ -16,15 +16,9 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include <asm/cputime.h> -#include <linux/cpufreq.h> -#include <linux/cpumask.h> #include <linux/export.h> #include <linux/kernel_stat.h> -#include <linux/mutex.h> #include <linux/slab.h> -#include <linux/types.h> -#include <linux/workqueue.h> #include "cpufreq_governor.h" @@ -53,7 +47,7 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu) policy = cdbs->cur_policy; - /* Get Absolute Load (in terms of freq for ondemand gov) */ + /* Get Absolute Load */ for_each_cpu(j, policy->cpus) { struct cpu_dbs_common_info *j_cdbs; u64 cur_wall_time, cur_idle_time; @@ -104,14 +98,6 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu) load = 100 * (wall_time - idle_time) / wall_time; - if (dbs_data->cdata->governor == GOV_ONDEMAND) { - int freq_avg = __cpufreq_driver_getavg(policy, j); - if (freq_avg <= 0) - freq_avg = policy->cur; - - load *= freq_avg; - } - if (load > max_load) max_load = load; } |