Pull trivial into test branch

[powerpc.git] / arch / i386 / kernel / cpu / cpufreq / acpi-cpufreq.c

diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 60d20cf..39bc16b 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -569,6 +569,7 @@ static int sw_any_bug_found(struct dmi_system_id *d)
        return 0;
 }
 
+#ifdef CONFIG_SMP
 static struct dmi_system_id sw_any_bug_dmi_table[] = {
        {
                .callback = sw_any_bug_found,
@@ -693,7 +694,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
                    perf->states[i].core_frequency * 1000;
                valid_states++;
        }
-       data->freq_table[perf->state_count].frequency = CPUFREQ_TABLE_END;
+       data->freq_table[valid_states].frequency = CPUFREQ_TABLE_END;
 
        result = cpufreq_frequency_table_cpuinfo(policy, data->freq_table);
        if (result)