diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-13 12:28:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-13 12:28:10 -0700 |
commit | 315d99318179b9cd5077ccc9f7f26a164c9fa998 (patch) | |
tree | 71b6c6bbb9474895513bed63e71e2a0315a1d21c /include | |
parent | 2df38a8e9b838c94e08f90f0487a90cea4f92c25 (diff) | |
parent | 78a6948bbadd0da46d318f3b7a954a71e02c39f7 (diff) | |
download | linux-stable-315d99318179b9cd5077ccc9f7f26a164c9fa998.tar.gz linux-stable-315d99318179b9cd5077ccc9f7f26a164c9fa998.tar.bz2 linux-stable-315d99318179b9cd5077ccc9f7f26a164c9fa998.zip |
Merge tag 'pm-5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki:
"These close a coverage gap in the intel_pstate driver and fix runtime
PM child count imbalance related to interactions with system-wide
suspend.
Specifics:
- Make intel_pstate work as expected on systems where the platform
firmware enables HWP even though the HWP EPP support is not
advertised (Rafael Wysocki).
- Fix possible runtime PM child count imbalance that may occur if
other runtime PM functions are called after invoking
pm_runtime_force_suspend() and before pm_runtime_force_resume()
is called (Tony Lindgren)"
* tag 'pm-5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM: runtime: Fix unpaired parent child_count for force_resume
cpufreq: intel_pstate: Use HWP if enabled by platform firmware
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index c9657408fee1..1d8209c09686 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -601,6 +601,7 @@ struct dev_pm_info { unsigned int idle_notification:1; unsigned int request_pending:1; unsigned int deferred_resume:1; + unsigned int needs_force_resume:1; unsigned int runtime_auto:1; bool ignore_children:1; unsigned int no_callbacks:1; |