diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:37:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:37:14 +0100 |
| commit | b2b062b8163391c42b3219d466ca1ac9742b9c7b (patch) | |
| tree | f3f920c09b8de694b1bc1d4b878cfd2b0b98c913 /arch/powerpc/platforms/cell/cpufreq_spudemand.c | |
| parent | a9de18eb761f7c1c860964b2e5addc1a35c7e861 (diff) | |
| parent | 99937d6455cea95405ac681c86a857d0fcd530bd (diff) | |
| download | op-kernel-dev-b2b062b8163391c42b3219d466ca1ac9742b9c7b.zip op-kernel-dev-b2b062b8163391c42b3219d466ca1ac9742b9c7b.tar.gz | |
Merge branch 'core/percpu' into stackprotector
Conflicts:
arch/x86/include/asm/pda.h
arch/x86/include/asm/system.h
Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/platforms/cell/cpufreq_spudemand.c')
| -rw-r--r-- | arch/powerpc/platforms/cell/cpufreq_spudemand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/cpufreq_spudemand.c b/arch/powerpc/platforms/cell/cpufreq_spudemand.c index a3c6c01..968c1c0 100644 --- a/arch/powerpc/platforms/cell/cpufreq_spudemand.c +++ b/arch/powerpc/platforms/cell/cpufreq_spudemand.c @@ -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; } |
