diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 14:49:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 14:49:25 -0800 |
| commit | e75080f185c103a638c66d7b65c673769a57cb87 (patch) | |
| tree | fa8678e324f7e2225b652685162c15c0c932f970 /Documentation | |
| parent | f6705bf959efac87bca76d40050d342f1d212587 (diff) | |
| parent | 3e4c9e637df1fac4123db5f3165b0034226a671b (diff) | |
| download | linux-e75080f185c103a638c66d7b65c673769a57cb87.tar.bz2 | |
Merge tag 'pm-fixes-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull two power management fixes from Rafael Wysocki:
"This is the change making /proc/cpuinfo on x86 report current CPU
frequency in "cpu MHz" again in all cases and an additional one
dealing with an overzealous check in one of the helper routines in the
runtime PM framework"
* tag 'pm-fixes-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / runtime: Drop children check from __pm_runtime_set_status()
x86 / CPU: Always show current CPU frequency in /proc/cpuinfo
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/power/runtime_pm.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt index 57af2f7963ee..937e33c46211 100644 --- a/Documentation/power/runtime_pm.txt +++ b/Documentation/power/runtime_pm.txt @@ -435,8 +435,7 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: PM status to 'suspended' and update its parent's counter of 'active' children as appropriate (it is only valid to use this function if 'power.runtime_error' is set or 'power.disable_depth' is greater than - zero); it will fail and return an error code if the device has a child - which is active and the 'power.ignore_children' flag is unset + zero) bool pm_runtime_active(struct device *dev); - return true if the device's runtime PM status is 'active' or its |