diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-07 23:11:43 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-07 23:11:43 +0200 |
| commit | 1133bfa6dcf034639486982629d29472737d5e96 (patch) | |
| tree | 8ab074d3dc96defa0e4b2032ecfc9cf38b86caef /drivers/cpufreq/cpufreq_governor.c | |
| parent | cpufreq: Pass policy to cpufreq_add_policy_cpu() (diff) | |
| parent | cpufreq: Remove unused function __cpufreq_driver_getavg() (diff) | |
| download | linux-1133bfa6dcf034639486982629d29472737d5e96.tar.xz linux-1133bfa6dcf034639486982629d29472737d5e96.zip | |
Merge branch 'pm-cpufreq-ondemand' into pm-cpufreq
* pm-cpufreq:
cpufreq: Remove unused function __cpufreq_driver_getavg()
cpufreq: Remove unused APERF/MPERF support
cpufreq: ondemand: Change the calculation of target frequency
Diffstat (limited to 'drivers/cpufreq/cpufreq_governor.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq_governor.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c index 7b839a8db2a7..7409dbd1d897 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c @@ -53,7 +53,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 +104,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; } |