Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Fix compile failure in cpufreq.c
This commit is contained in:
Linus Torvalds 2009-07-08 20:59:13 -07:00
commit 34f25476ac

View File

@ -776,9 +776,6 @@ static int cpufreq_add_dev(struct sys_device *sys_dev)
struct sys_device *cpu_sys_dev; struct sys_device *cpu_sys_dev;
unsigned long flags; unsigned long flags;
unsigned int j; unsigned int j;
#ifdef CONFIG_SMP
struct cpufreq_policy *managed_policy;
#endif
if (cpu_is_offline(cpu)) if (cpu_is_offline(cpu))
return 0; return 0;
@ -854,6 +851,8 @@ static int cpufreq_add_dev(struct sys_device *sys_dev)
#endif #endif
for_each_cpu(j, policy->cpus) { for_each_cpu(j, policy->cpus) {
struct cpufreq_policy *managed_policy;
if (cpu == j) if (cpu == j)
continue; continue;
@ -932,6 +931,8 @@ static int cpufreq_add_dev(struct sys_device *sys_dev)
/* symlink affected CPUs */ /* symlink affected CPUs */
for_each_cpu(j, policy->cpus) { for_each_cpu(j, policy->cpus) {
struct cpufreq_policy *managed_policy;
if (j == cpu) if (j == cpu)
continue; continue;
if (!cpu_online(j)) if (!cpu_online(j))