Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24dafdf0 authored by Karsten Keil's avatar Karsten Keil
Browse files

Merge branch 'master' of... 

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

arch/powerpc/platforms/cell/cbe_cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	policy->cur = cbe_freqs[cur_pmode].frequency;



#ifdef CONFIG_SMP

	policy->cpus = per_cpu(cpu_sibling_map, policy->cpu);

	cpumask_copy(policy->cpus, &per_cpu(cpu_sibling_map, policy->cpu));

#endif



	cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu);

arch/powerpc/platforms/cell/cpufreq_spudemand.c

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event) 
		}



		/* 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->policy = policy;

		}
@@ -127,7 +127,7 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event) 
		spu_gov_cancel_work(info);



		/* 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->policy = NULL;

		}

arch/powerpc/platforms/pasemi/cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	pr_debug("current astate is at %d\n",cur_astate);



	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;

arch/powerpc/platforms/powermac/cpufreq_64.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	/* secondary CPUs are tied to the primary one by the

	 * cpufreq core if in the secondary policy we tell it that

	 * 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);



	return cpufreq_frequency_table_cpuinfo(policy,