diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-09 09:25:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-09 09:25:31 -0700 |
| commit | ccd6c35c72c771616c37d1978e02a982da0678ef (patch) | |
| tree | 12ab764a9c0deca1010bd75a6beb1e6d90962a29 /drivers | |
| parent | Bluetooth: btusb: Revert Fix the autosuspend enable and disable (diff) | |
| parent | ACPI: processor: Fix build when CONFIG_ACPI_PROCESSOR=m (diff) | |
| download | linux-dev-ccd6c35c72c771616c37d1978e02a982da0678ef.tar.xz linux-dev-ccd6c35c72c771616c37d1978e02a982da0678ef.zip | |
Merge tag 'acpi-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"Fix a build issue introduced by a previous fix in the ACPI processor
driver (Vitaly Kuznetsov)"
* tag 'acpi-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: processor: Fix build when CONFIG_ACPI_PROCESSOR=m
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 768a6b4d2368..4e2d76b8b697 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -544,9 +544,7 @@ static int acpi_idle_play_dead(struct cpuidle_device *dev, int index) return -ENODEV; #if defined(CONFIG_X86) && defined(CONFIG_HOTPLUG_CPU) - /* If NMI wants to wake up CPU0, start CPU0. */ - if (wakeup_cpu0()) - start_cpu0(); + cond_wakeup_cpu0(); #endif } |