diff --git a/[refs] b/[refs] index fa6fc7e3265f..ee43cceeee9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b9c6671f8dbedbd071a9a6c787d4086a8990db4 +refs/heads/master: 3d4a7ef3d3f0c9f3cf8da724d5935253a713d8b6 diff --git a/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c index 60d20cf427aa..18f4715c655d 100644 --- a/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c @@ -693,7 +693,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)