Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7559b13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e60d7458 c4686c71

drivers/acpi/processor_core.c

+4 −2
Original line number Diff line number Diff line
@@ -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;