diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-14 11:51:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-14 11:51:11 -0700 |
| commit | a7559b13de77d720903c1b1d45cd3b5b0b30a643 (patch) | |
| tree | 8db408ba6495c13340aaa64051fdedd011f0ea9e /drivers/acpi | |
| parent | e60d7458cb8f57617352cb7f24b48d5b30773fc1 (diff) | |
| parent | c4686c71a9183f76e3ef59098da5c098748672f6 (diff) | |
| download | linux-3.10-a7559b13de77d720903c1b1d45cd3b5b0b30a643.tar.gz linux-3.10-a7559b13de77d720903c1b1d45cd3b5b0b30a643.tar.bz2 linux-3.10-a7559b13de77d720903c1b1d45cd3b5b0b30a643.zip | |
Merge tag 'cpufreq-for-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull cpufreq fix from Rafael Wysocki:
"This fixes a regression preventing the ACPI cpufreq driver from
loading on some systems where it worked previously without any
problems."
* tag 'cpufreq-for-3.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq / ACPI: Fix not loading acpi-cpufreq driver regression
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index c850de4c9a1..eff722278ff 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -189,10 +189,12 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id) * Processor (CPU3, 0x03, 0x00000410, 0x06) {} * } * - * Ignores apic_id and always return 0 for CPU0's handle. + * Ignores apic_id and always returns 0 for the processor + * handle with acpi id 0 if nr_cpu_ids is 1. + * This should be the case if SMP tables are not found. * Return -1 for other CPU's handle. */ - if (acpi_id == 0) + if (nr_cpu_ids <= 1 && acpi_id == 0) return acpi_id; else return apic_id; |