diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:52:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:52:23 -0800 |
| commit | be9bf30c73184e0f1e4e0a50fb193d2a551bf75e (patch) | |
| tree | b94e1b39d59fa10b26fd740993ded00708de08e1 /arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | |
| parent | ace48471736a4b00753c74633f430c4a3a7d89cb (diff) | |
| parent | 84f0b1ef8c013b33dea9bbc2521094dd29110cf0 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] kzalloc conversion for gx-suspmod
[CPUFREQ] Whitespace cleanup
[CPUFREQ] Mark longhaul driver as broken.
[PATCH] cpufreq: fix section mismatch warnings
[CPUFREQ] Fix the p4-clockmod N60 errata workaround.
[CPUFREQ] Fix handling for CPU hotplug
[CPUFREQ] powernow-k8: Let cpufreq driver handle affected CPUs
[CPUFREQ] Lots of whitespace & CodingStyle cleanup.
[CPUFREQ] Remove duplicate cpuinfo struct
[CPUFREQ] Silence powernow-k8 warning on k7's.
Diffstat (limited to 'arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c')
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c index c173c0fa117..b0ff9075708 100644 --- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c +++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c @@ -479,15 +479,13 @@ static int centrino_cpu_init(struct cpufreq_policy *policy) 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; - if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) { + if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) centrino_driver.flags |= CPUFREQ_CONST_LOOPS; - } if (centrino_cpu_init_acpi(policy)) { if (policy->cpu != 0) |