aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-28 17:03:00 -0500
committerLen Brown <len.brown@intel.com>2006-04-01 21:13:15 -0500
commit7e1f19e50371e1d148226b64c8edc77fec47fa5b (patch)
tree1daff4e687c568b0245dbdb92a3ec993abdbe464 /arch/i386
parentd52bb94d56676acd9bdac8e097257a87b4b1b2e1 (diff)
ACPI: UP build fix for bugzilla-5737
cpu_online_map doesn't exist if !CONFIG_SMP. Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c4
-rw-r--r--arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 4c7c6e089e87..11da3ca237e3 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -225,8 +225,12 @@ acpi_cpufreq_target (
225 freqs.old = data->freq_table[cur_state].frequency; 225 freqs.old = data->freq_table[cur_state].frequency;
226 freqs.new = data->freq_table[next_state].frequency; 226 freqs.new = data->freq_table[next_state].frequency;
227 227
228#ifdef CONFIG_HOTPLUG_CPU
228 /* cpufreq holds the hotplug lock, so we are safe from here on */ 229 /* cpufreq holds the hotplug lock, so we are safe from here on */
229 cpus_and(online_policy_cpus, cpu_online_map, policy->cpus); 230 cpus_and(online_policy_cpus, cpu_online_map, policy->cpus);
231#else
232 online_policy_cpus = policy->cpus;
233#endif
230 234
231 for_each_cpu_mask(j, online_policy_cpus) { 235 for_each_cpu_mask(j, online_policy_cpus) {
232 freqs.cpu = j; 236 freqs.cpu = j;
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index 37dee862f0d3..9a65993396ed 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -654,8 +654,12 @@ static int centrino_target (struct cpufreq_policy *policy,
654 return -EINVAL; 654 return -EINVAL;
655 } 655 }
656 656
657#ifdef CONFIG_HOTPLUG_CPU
657 /* cpufreq holds the hotplug lock, so we are safe from here on */ 658 /* cpufreq holds the hotplug lock, so we are safe from here on */
658 cpus_and(online_policy_cpus, cpu_online_map, policy->cpus); 659 cpus_and(online_policy_cpus, cpu_online_map, policy->cpus);
660#else
661 online_policy_cpus = policy->cpus;
662#endif
659 663
660 saved_mask = current->cpus_allowed; 664 saved_mask = current->cpus_allowed;
661 first_cpu = 1; 665 first_cpu = 1;