Skip to content

Commit

Permalink
ACPI: UP build fix for bugzilla-5737
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Morton authored and Len Brown committed Apr 2, 2006
1 parent d52bb94 commit 7e1f19e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 7e1f19e

Please sign in to comment.