diff options
author | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
commit | ed03f430cdc8c802652467e9097606fedc2c7abc (patch) | |
tree | 30941ec1e6f93e99358fefe18175e5dd800a4379 /drivers/cpufreq/cpufreq_conservative.c | |
parent | ed349a8a0a780ed27e2a765f16cee54d9b63bfee (diff) | |
parent | 6f957eaf79356a32e838f5f262ee9a60544b1d5b (diff) |
Pull pnpacpi into acpica branch
Diffstat (limited to 'drivers/cpufreq/cpufreq_conservative.c')
-rw-r--r-- | drivers/cpufreq/cpufreq_conservative.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 2ed5c4363b53..39543a2bed0f 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c | |||
@@ -93,7 +93,7 @@ static inline unsigned int get_cpu_idle_time(unsigned int cpu) | |||
93 | { | 93 | { |
94 | return kstat_cpu(cpu).cpustat.idle + | 94 | return kstat_cpu(cpu).cpustat.idle + |
95 | kstat_cpu(cpu).cpustat.iowait + | 95 | kstat_cpu(cpu).cpustat.iowait + |
96 | ( !dbs_tuners_ins.ignore_nice ? | 96 | ( dbs_tuners_ins.ignore_nice ? |
97 | kstat_cpu(cpu).cpustat.nice : | 97 | kstat_cpu(cpu).cpustat.nice : |
98 | 0); | 98 | 0); |
99 | } | 99 | } |
@@ -127,7 +127,7 @@ show_one(sampling_rate, sampling_rate); | |||
127 | show_one(sampling_down_factor, sampling_down_factor); | 127 | show_one(sampling_down_factor, sampling_down_factor); |
128 | show_one(up_threshold, up_threshold); | 128 | show_one(up_threshold, up_threshold); |
129 | show_one(down_threshold, down_threshold); | 129 | show_one(down_threshold, down_threshold); |
130 | show_one(ignore_nice, ignore_nice); | 130 | show_one(ignore_nice_load, ignore_nice); |
131 | show_one(freq_step, freq_step); | 131 | show_one(freq_step, freq_step); |
132 | 132 | ||
133 | static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused, | 133 | static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused, |
@@ -207,7 +207,7 @@ static ssize_t store_down_threshold(struct cpufreq_policy *unused, | |||
207 | return count; | 207 | return count; |
208 | } | 208 | } |
209 | 209 | ||
210 | static ssize_t store_ignore_nice(struct cpufreq_policy *policy, | 210 | static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy, |
211 | const char *buf, size_t count) | 211 | const char *buf, size_t count) |
212 | { | 212 | { |
213 | unsigned int input; | 213 | unsigned int input; |
@@ -272,7 +272,7 @@ define_one_rw(sampling_rate); | |||
272 | define_one_rw(sampling_down_factor); | 272 | define_one_rw(sampling_down_factor); |
273 | define_one_rw(up_threshold); | 273 | define_one_rw(up_threshold); |
274 | define_one_rw(down_threshold); | 274 | define_one_rw(down_threshold); |
275 | define_one_rw(ignore_nice); | 275 | define_one_rw(ignore_nice_load); |
276 | define_one_rw(freq_step); | 276 | define_one_rw(freq_step); |
277 | 277 | ||
278 | static struct attribute * dbs_attributes[] = { | 278 | static struct attribute * dbs_attributes[] = { |
@@ -282,7 +282,7 @@ static struct attribute * dbs_attributes[] = { | |||
282 | &sampling_down_factor.attr, | 282 | &sampling_down_factor.attr, |
283 | &up_threshold.attr, | 283 | &up_threshold.attr, |
284 | &down_threshold.attr, | 284 | &down_threshold.attr, |
285 | &ignore_nice.attr, | 285 | &ignore_nice_load.attr, |
286 | &freq_step.attr, | 286 | &freq_step.attr, |
287 | NULL | 287 | NULL |
288 | }; | 288 | }; |