diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-03-28 17:03:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-04-01 21:13:15 -0500 |
| commit | 7e1f19e50371e1d148226b64c8edc77fec47fa5b (patch) | |
| tree | 1daff4e687c568b0245dbdb92a3ec993abdbe464 | |
| parent | d52bb94d56676acd9bdac8e097257a87b4b1b2e1 (diff) | |
| download | blackbird-op-linux-7e1f19e50371e1d148226b64c8edc77fec47fa5b.tar.gz blackbird-op-linux-7e1f19e50371e1d148226b64c8edc77fec47fa5b.zip | |
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>
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 4 | ||||
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | 4 |
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 ( freqs.old = data->freq_table[cur_state].frequency; freqs.new = data->freq_table[next_state].frequency; +#ifdef CONFIG_HOTPLUG_CPU /* cpufreq holds the hotplug lock, so we are safe from here on */ cpus_and(online_policy_cpus, cpu_online_map, policy->cpus); +#else + online_policy_cpus = policy->cpus; +#endif for_each_cpu_mask(j, online_policy_cpus) { 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, return -EINVAL; } +#ifdef CONFIG_HOTPLUG_CPU /* cpufreq holds the hotplug lock, so we are safe from here on */ cpus_and(online_policy_cpus, cpu_online_map, policy->cpus); +#else + online_policy_cpus = policy->cpus; +#endif saved_mask = current->cpus_allowed; first_cpu = 1; |
