From fddae7d2783660c14eec1492a712f38fc3133a78 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 28 Mar 2006 17:03:00 -0500 Subject: [PATCH] --- yaml --- r: 29166 b: refs/heads/master c: 7e1f19e50371e1d148226b64c8edc77fec47fa5b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 4 ++++ trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 380583ac12de..40d7a902dce6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d52bb94d56676acd9bdac8e097257a87b4b1b2e1 +refs/heads/master: 7e1f19e50371e1d148226b64c8edc77fec47fa5b diff --git a/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c index 4c7c6e089e87..11da3ca237e3 100644 --- a/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/trunk/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/trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c index 37dee862f0d3..9a65993396ed 100644 --- a/trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c +++ b/trunk/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;