Commit 3fa77874 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-6.18-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "One more urgent ACPI support fix for 6.18

  There is one more commit that needs to be reverted after reverting
  problematic commit 7a8c994c ("ACPI: processor: idle: Optimize ACPI
  idle driver registration"), so revert it"

* tag 'acpi-6.18-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI: processor: Update cpuidle driver check in __acpi_processor_start()"
parents e1afacb6 fbf04215

drivers/acpi/processor_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static int __acpi_processor_start(struct acpi_device *device) 
	if (result && !IS_ENABLED(CONFIG_ACPI_CPU_FREQ_PSS))

		dev_dbg(&device->dev, "CPPC data invalid or not present\n");



	if (cpuidle_get_driver() == &acpi_idle_driver)

	if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)

		acpi_processor_power_init(pr);



	acpi_pss_perf_init(pr);