aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-08 23:59:13 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-08 23:59:13 -0400
commit34f25476ace556263784ea2f8173e22b25557a13 (patch)
tree5a2d0bc7a57ef4b8224e7159cf9dee8364a847c3 /drivers
parent2e3167308048ca6c810733384d8289082f7e4ec1 (diff)
parent5e1596f75395e7a402e1059c518e633d2732dcf8 (diff)
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/cpufreq.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index c668ac855f71..b90eda8b3440 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -776,9 +776,6 @@ static int cpufreq_add_dev(struct sys_device *sys_dev)
776 struct sys_device *cpu_sys_dev; 776 struct sys_device *cpu_sys_dev;
777 unsigned long flags; 777 unsigned long flags;
778 unsigned int j; 778 unsigned int j;
779#ifdef CONFIG_SMP
780 struct cpufreq_policy *managed_policy;
781#endif
782 779
783 if (cpu_is_offline(cpu)) 780 if (cpu_is_offline(cpu))
784 return 0; 781 return 0;
@@ -854,6 +851,8 @@ static int cpufreq_add_dev(struct sys_device *sys_dev)
854#endif 851#endif
855 852
856 for_each_cpu(j, policy->cpus) { 853 for_each_cpu(j, policy->cpus) {
854 struct cpufreq_policy *managed_policy;
855
857 if (cpu == j) 856 if (cpu == j)
858 continue; 857 continue;
859 858
@@ -932,6 +931,8 @@ static int cpufreq_add_dev(struct sys_device *sys_dev)
932 931
933 /* symlink affected CPUs */ 932 /* symlink affected CPUs */
934 for_each_cpu(j, policy->cpus) { 933 for_each_cpu(j, policy->cpus) {
934 struct cpufreq_policy *managed_policy;
935
935 if (j == cpu) 936 if (j == cpu)
936 continue; 937 continue;
937 if (!cpu_online(j)) 938 if (!cpu_online(j))