From: Andrew Morton 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 Cc: Len Brown Signed-off-by: Andrew Morton --- arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 ++ arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | 2 ++ 2 files changed, 4 insertions(+) diff -puN arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~git-acpi-up-fix arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c --- devel/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~git-acpi-up-fix 2006-03-07 23:44:46.000000000 -0800 +++ devel-akpm/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2006-03-07 23:44:46.000000000 -0800 @@ -225,8 +225,10 @@ acpi_cpufreq_target ( freqs.old = data->freq_table[cur_state].frequency; freqs.new = data->freq_table[next_state].frequency; +#ifdef CONFIG_SMP /* cpufreq holds the hotplug lock, so we are safe from here on */ cpus_and(online_policy_cpus, cpu_online_map, policy->cpus); +#endif for_each_cpu_mask(j, online_policy_cpus) { freqs.cpu = j; diff -puN arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c~git-acpi-up-fix arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c --- devel/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c~git-acpi-up-fix 2006-03-07 23:44:50.000000000 -0800 +++ devel-akpm/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c 2006-03-07 23:44:50.000000000 -0800 @@ -654,8 +654,10 @@ static int centrino_target (struct cpufr return -EINVAL; } +#ifdef CONFIG_SMP /* cpufreq holds the hotplug lock, so we are safe from here on */ cpus_and(online_policy_cpus, cpu_online_map, policy->cpus); +#endif saved_mask = current->cpus_allowed; first_cpu = 1; _