Pull bugzilla-5737 into release branch

[linux-2.6.git] / arch / i386 / kernel / cpu / cpufreq / speedstep-centrino.c

diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index 9a65993396edfba43d032d70d4dff20a0b51e393..4535ca0fe0cf883783d6cec27f722ebd484da536 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -514,15 +514,13 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
        unsigned l, h;
        int ret;
        int i;
        unsigned l, h;
        int ret;
        int i;

-       struct cpuinfo_x86 *c = &cpu_data[policy->cpu];

 
        /* Only Intel makes Enhanced Speedstep-capable CPUs */
        if (cpu->x86_vendor != X86_VENDOR_INTEL || !cpu_has(cpu, X86_FEATURE_EST))
                return -ENODEV;
 
 
        /* Only Intel makes Enhanced Speedstep-capable CPUs */
        if (cpu->x86_vendor != X86_VENDOR_INTEL || !cpu_has(cpu, X86_FEATURE_EST))
                return -ENODEV;
 

-       if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
+       if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))

                centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
                centrino_driver.flags |= CPUFREQ_CONST_LOOPS;

-       }

 
        if (centrino_cpu_init_acpi(policy)) {
                if (policy->cpu != 0)
 
        if (centrino_cpu_init_acpi(policy)) {
                if (policy->cpu != 0)