diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:43:20 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:43:20 -0400 |
| commit | 26ba2a7a9f4d8921f095af646a7d22c15a148028 (patch) | |
| tree | 1e694da6999653551bc61eb9cc6db2eb4645fcd1 /drivers/cpufreq/cpufreq_conservative.c | |
| parent | 91190758d410a5d33c6051ba9ca95baa430256bb (diff) | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/cpufreq/cpufreq_conservative.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq_conservative.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index e1df376e709e..2ed5c4363b53 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c | |||
| @@ -315,9 +315,9 @@ static void dbs_check_cpu(int cpu) | |||
| 315 | policy = this_dbs_info->cur_policy; | 315 | policy = this_dbs_info->cur_policy; |
| 316 | 316 | ||
| 317 | if ( init_flag == 0 ) { | 317 | if ( init_flag == 0 ) { |
| 318 | for ( /* NULL */; init_flag < NR_CPUS; init_flag++ ) { | 318 | for_each_online_cpu(j) { |
| 319 | dbs_info = &per_cpu(cpu_dbs_info, init_flag); | 319 | dbs_info = &per_cpu(cpu_dbs_info, j); |
| 320 | requested_freq[cpu] = dbs_info->cur_policy->cur; | 320 | requested_freq[j] = dbs_info->cur_policy->cur; |
| 321 | } | 321 | } |
| 322 | init_flag = 1; | 322 | init_flag = 1; |
| 323 | } | 323 | } |