浏览代码

[CPUFREQ][7/8] acpi-cpufreq: Fix get of current frequency breakage

Recent speedstep-centrino unification onto acpi-cpufreq patchset broke
cpuinfo_cur_freq interface in /sys/../cpuinfo/, when MSR was used for
transitions. Attached patch fixes that breakage.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Dave Jones <davej@redhat.com>
Venkatesh Pallipadi 18 年之前
父节点
当前提交
a6f6e6e6ab
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

+ 4 - 1
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

@@ -101,10 +101,13 @@ static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data)
 static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
 {
 	int i;
+	struct acpi_processor_performance *perf;
 
 	msr &= INTEL_MSR_RANGE;
+	perf = data->acpi_data;
+
 	for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-		if (msr == data->freq_table[i].index)
+		if (msr == perf->states[data->freq_table[i].index].status)
 			return data->freq_table[i].frequency;
 	}
 	return data->freq_table[0].frequency;