diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 13:55:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 13:55:48 -0800 |
| commit | 1486b2014a1276b0134c774eddd79fd91352b791 (patch) | |
| tree | f51adeae23e3557287df0488b9a4ef4ef4eeb2e9 /arch | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff) | |
| parent | [CPUFREQ] Enable ACPI PDC handshake for VIA/Centaur CPUs (diff) | |
| download | linux-dev-1486b2014a1276b0134c774eddd79fd91352b791.tar.xz linux-dev-1486b2014a1276b0134c774eddd79fd91352b791.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] Enable ACPI PDC handshake for VIA/Centaur CPUs
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/acpi/processor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c index d296f4a195c9..d85d1b2432ba 100644 --- a/arch/x86/kernel/acpi/processor.c +++ b/arch/x86/kernel/acpi/processor.c @@ -79,7 +79,8 @@ void arch_acpi_processor_init_pdc(struct acpi_processor *pr) struct cpuinfo_x86 *c = &cpu_data(pr->id); pr->pdc = NULL; - if (c->x86_vendor == X86_VENDOR_INTEL) + if (c->x86_vendor == X86_VENDOR_INTEL || + c->x86_vendor == X86_VENDOR_CENTAUR) init_intel_pdc(pr, c); return; |