evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for_2.6.29

Browse source
This commit is contained in:
Karsten Keil 2009-01-12 13:16:17 +01:00
commit 24dafdf00b
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/platforms/cell/cbe_cpufreq.c
View file

@ -118,7 +118,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
policy->cur = cbe_freqs[cur_pmode].frequency; policy->cur = cbe_freqs[cur_pmode].frequency;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
policy->cpus = per_cpu(cpu_sibling_map, policy->cpu); cpumask_copy(policy->cpus, &per_cpu(cpu_sibling_map, policy->cpu));
#endif #endif
cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu); cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu);

4
arch/powerpc/platforms/cell/cpufreq_spudemand.c
View file

@ -110,7 +110,7 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event)
} }
/* initialize spu_gov_info for all affected cpus */ /* initialize spu_gov_info for all affected cpus */
for_each_cpu_mask(i, policy->cpus) { for_each_cpu(i, policy->cpus) {
affected_info = &per_cpu(spu_gov_info, i); affected_info = &per_cpu(spu_gov_info, i);
affected_info->policy = policy; affected_info->policy = policy;
} }
@ -127,7 +127,7 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event)
spu_gov_cancel_work(info); spu_gov_cancel_work(info);
/* clean spu_gov_info for all affected cpus */ /* clean spu_gov_info for all affected cpus */
for_each_cpu_mask (i, policy->cpus) { for_each_cpu (i, policy->cpus) {
info = &per_cpu(spu_gov_info, i); info = &per_cpu(spu_gov_info, i);
info->policy = NULL; info->policy = NULL;
} }

2
arch/powerpc/platforms/pasemi/cpufreq.c
View file

@ -213,7 +213,7 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
pr_debug("current astate is at %d\n",cur_astate); pr_debug("current astate is at %d\n",cur_astate);
policy->cur = pas_freqs[cur_astate].frequency; policy->cur = pas_freqs[cur_astate].frequency;
policy->cpus = cpu_online_map; cpumask_copy(policy->cpus, &cpu_online_map);
ppc_proc_freq = policy->cur * 1000ul; ppc_proc_freq = policy->cur * 1000ul;

2
arch/powerpc/platforms/powermac/cpufreq_64.c
View file

@ -362,7 +362,7 @@ static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy)
/* secondary CPUs are tied to the primary one by the /* secondary CPUs are tied to the primary one by the
* cpufreq core if in the secondary policy we tell it that * cpufreq core if in the secondary policy we tell it that
* it actually must be one policy together with all others. */ * it actually must be one policy together with all others. */
policy->cpus = cpu_online_map; cpumask_copy(policy->cpus, &cpu_online_map);
cpufreq_frequency_table_get_attr(g5_cpu_freqs, policy->cpu); cpufreq_frequency_table_get_attr(g5_cpu_freqs, policy->cpu);
return cpufreq_frequency_table_cpuinfo(policy, return cpufreq_frequency_table_cpuinfo(policy,