diff options
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 @@ | |||
16 | 16 | ||
17 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 17 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
18 | 18 | ||
19 | #include <asm/cputime.h> | ||
20 | #include <linux/cpufreq.h> | ||
21 | #include <linux/cpumask.h> | ||
22 | #include <linux/export.h> | 19 | #include <linux/export.h> |
23 | #include <linux/kernel_stat.h> | 20 | #include <linux/kernel_stat.h> |
24 | #include <linux/mutex.h> | ||
25 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
26 | #include <linux/types.h> | ||
27 | #include <linux/workqueue.h> | ||
28 | 22 | ||
29 | #include "cpufreq_governor.h" | 23 | #include "cpufreq_governor.h" |
30 | 24 | ||
@@ -53,7 +47,7 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu) | |||
53 | 47 | ||
54 | policy = cdbs->cur_policy; | 48 | policy = cdbs->cur_policy; |
55 | 49 | ||
56 | /* Get Absolute Load (in terms of freq for ondemand gov) */ | 50 | /* Get Absolute Load */ |
57 | for_each_cpu(j, policy->cpus) { | 51 | for_each_cpu(j, policy->cpus) { |
58 | struct cpu_dbs_common_info *j_cdbs; | 52 | struct cpu_dbs_common_info *j_cdbs; |
59 | u64 cur_wall_time, cur_idle_time; | 53 | u64 cur_wall_time, cur_idle_time; |
@@ -104,14 +98,6 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu) | |||
104 | 98 | ||
105 | load = 100 * (wall_time - idle_time) / wall_time; | 99 | load = 100 * (wall_time - idle_time) / wall_time; |
106 | 100 | ||
107 | if (dbs_data->cdata->governor == GOV_ONDEMAND) { | ||
108 | int freq_avg = __cpufreq_driver_getavg(policy, j); | ||
109 | if (freq_avg <= 0) | ||
110 | freq_avg = policy->cur; | ||
111 | |||
112 | load *= freq_avg; | ||
113 | } | ||
114 | |||
115 | if (load > max_load) | 101 | if (load > max_load) |
116 | max_load = load; | 102 | max_load = load; |
117 | } | 103 | } |