diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-18 17:34:04 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-18 17:34:04 +0200 |
commit | e59b76ff67e527e58914409f13a9cffa1cbf42e7 (patch) | |
tree | 80bb7f7c654b7beb46f1f61183e1c5d0f22dc3a7 /kernel | |
parent | Merge tag 'mkp-scsi-postmerge' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | Merge branches 'pm-cpufreq' and 'pm-sleep' (diff) | |
download | linux-e59b76ff67e527e58914409f13a9cffa1cbf42e7.tar.xz linux-e59b76ff67e527e58914409f13a9cffa1cbf42e7.zip |
Merge tag 'pm-5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki:
"These include a fix for a recent regression in the ACPI CPU
performance scaling code, a PCI device power management fix,
a system shutdown fix related to cpufreq, a removal of an ACPI
suspend-to-idle blacklist entry and a build warning fix.
Specifics:
- Fix possible NULL pointer dereference in the ACPI processor scaling
initialization code introduced by a recent cpufreq update (Rafael
Wysocki).
- Fix possible deadlock due to suspending cpufreq too late during
system shutdown (Rafael Wysocki).
- Make the PCI device system resume code path be more consistent with
its PM-runtime counterpart to fix an issue with missing delay on
transitions from D3cold to D0 during system resume from
suspend-to-idle on some systems (Rafael Wysocki).
- Drop Dell XPS13 9360 from the LPS0 Idle _DSM blacklist to make it
use suspend-to-idle by default (Mario Limonciello).
- Fix build warning in the core system suspend support code (Ben
Dooks)"
* tag 'pm-5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: processor: Avoid NULL pointer dereferences at init time
PCI: PM: Fix pci_power_up()
PM: sleep: include <linux/pm_runtime.h> for pm_wq
cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown
ACPI: PM: Drop Dell XPS13 9360 from LPS0 Idle _DSM blacklist
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/power/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index e8710d179b35..e26de7af520b 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -15,6 +15,7 @@ #include <linux/seq_file.h> #include <linux/suspend.h> #include <linux/syscalls.h> +#include <linux/pm_runtime.h> #include "power.h" |