Skip to content

Commit 34fa09c

Browse files
committed
Revert "ACPI: processor: Do not expose global variable acpi_idle_driver"
Revert commit 559f2ea ACPI: processor: Do not expose global variable acpi_idle_driver" because it depends on a problematic one. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent ac3fd01 commit 34fa09c

3 files changed

Lines changed: 4 additions & 9 deletions

File tree

drivers/acpi/processor_driver.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ static int __acpi_processor_start(struct acpi_device *device)
166166
if (result && !IS_ENABLED(CONFIG_ACPI_CPU_FREQ_PSS))
167167
dev_dbg(&device->dev, "CPPC data invalid or not present\n");
168168

169-
acpi_processor_power_init(pr);
169+
if (cpuidle_get_driver() == &acpi_idle_driver)
170+
acpi_processor_power_init(pr);
170171

171172
acpi_pss_perf_init(pr);
172173

drivers/acpi/processor_idle.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ module_param(latency_factor, uint, 0644);
5151

5252
static DEFINE_PER_CPU(struct cpuidle_device *, acpi_cpuidle_device);
5353

54-
static struct cpuidle_driver acpi_idle_driver = {
54+
struct cpuidle_driver acpi_idle_driver = {
5555
.name = "acpi_idle",
5656
.owner = THIS_MODULE,
5757
};
@@ -1404,13 +1404,6 @@ void acpi_processor_power_init(struct acpi_processor *pr)
14041404
{
14051405
struct cpuidle_device *dev;
14061406

1407-
/*
1408-
* The code below only works if the current cpuidle driver is the ACPI
1409-
* idle driver.
1410-
*/
1411-
if (cpuidle_get_driver() != &acpi_idle_driver)
1412-
return;
1413-
14141407
if (disabled_by_idle_boot_param())
14151408
return;
14161409

include/acpi/processor.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,7 @@ static inline void acpi_processor_throttling_init(void) {}
417417
#endif /* CONFIG_ACPI_CPU_FREQ_PSS */
418418

419419
/* in processor_idle.c */
420+
extern struct cpuidle_driver acpi_idle_driver;
420421
#ifdef CONFIG_ACPI_PROCESSOR_IDLE
421422
void acpi_processor_power_init(struct acpi_processor *pr);
422423
void acpi_processor_power_exit(struct acpi_processor *pr);

0 commit comments

Comments
 (0)