diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 22:13:32 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 22:13:32 -0400 |
| commit | 434f1d10c1adb6c2e333d501ce1e42be610e0723 (patch) | |
| tree | a43f1e6f40ea1530e648ae72709a2c45442891aa /drivers/cpufreq/cpufreq_conservative.c | |
| parent | 6070fe6f82c67021367092855c0812a98becf0fa (diff) | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
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 | } |