aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>2006-10-03 15:37:42 -0400
committerDave Jones <davej@redhat.com>2006-10-15 19:57:11 -0400
commita6f6e6e6ab464c9d1dff66570b78be2f66d8ba3d (patch)
treea6d56f011279cd84b4bd1bb616d551bb09d32dcc
parent7650b281b091f39f5e97f13b45ab3813b1526b65 (diff)
[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>
-rw-r--r--arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index e6513e994088..8b0c7db85a47 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -101,10 +101,13 @@ static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data)
101static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data) 101static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
102{ 102{
103 int i; 103 int i;
104 struct acpi_processor_performance *perf;
104 105
105 msr &= INTEL_MSR_RANGE; 106 msr &= INTEL_MSR_RANGE;
107 perf = data->acpi_data;
108
106 for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) { 109 for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
107 if (msr == data->freq_table[i].index) 110 if (msr == perf->states[data->freq_table[i].index].status)
108 return data->freq_table[i].frequency; 111 return data->freq_table[i].frequency;
109 } 112 }
110 return data->freq_table[0].frequency; 113 return data->freq_table[0].frequency;