git-acpi: uniprocessor compile fixes

PATCH New [email protected] 1 participant 1 message Mar 22, 2006 ACPI

lore

Share & tools

lore

[email protected]

author

2006-03-22 06:33 UTC #0 lore raw

PATCH 1/23 git-acpi: uniprocessor compile fixes

From: Andrew Morton <[email protected]>,
Venkatesh Pallipadi <[email protected]>

cpu_online_map doesn't exist if !CONFIG_SMP.

This path is rather lame and it'd be nice to fix it better.

Cc Venkatesh Pallipadi <[email protected]>

Cc Len Brown <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c       |    4 ++++
 arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c |    4 ++++
 2 files changed, 8 insertions(+)

arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c renamed from arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~git-acpi-up-fix +4 -0

diff -puN arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~git-acpi-up-fix 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;

arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c renamed from arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c~git-acpi-up-fix +4 -0

diff -puN arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c~git-acpi-up-fix arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -654,8 +654,12 @@ static int centrino_target (struct cpufr
 		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;