diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-21 16:57:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-21 16:57:36 -0400 |
| commit | 26c92a38cec99ee7b657901ff64bd01a96a2fb22 (patch) | |
| tree | 8c5c51b76354a81544c9e1f15d29606f859113eb /Documentation | |
| parent | 1abd8a8f39cd9a2925149000056494523c85643a (diff) | |
| parent | b51e001385f1c861445af3efeab766811ee8db29 (diff) | |
Merge tag 'pm-4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management updates from Rafael Wysocki:
"These are mostly fixes, including some fixes for changes made during
the recent merge window and some "stable" material, plus some minor
extensions of the turbostat utility.
Specifics:
- Fix the PM core to avoid introducing a runtime PM usage counter
imbalance when adding device links during driver probe (Rafael
Wysocki).
- Fix the operating performance points (OPP) framework to ensure that
the regulator voltage is always updated as appropriate when
updating clock rates (Waldemar Rymarkiewicz).
- Fix the intel_pstate driver to use correct max/min limits for cores
with differing maximum frequences (Srinivas Pandruvada).
- Fix a typo in the intel_pstate driver documentation (Rafael
Wysocki).
- Fix two issues with the recently added Kryo cpufreq driver (Ilia
Lin).
- Fix two recent regressions and some other minor issues in the
turbostat utility and extend it to provide some more diagnostic
information (Len Brown, Nathan Ciobanu)"
* tag 'pm-4.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Documentation: intel_pstate: Fix typo
tools/power turbostat: version 18.06.20
tools/power turbostat: add the missing command line switches
tools/power turbostat: add single character tokens to help
tools/power turbostat: alphabetize the help output
tools/power turbostat: fix segfault on 'no node' machines
tools/power turbostat: add optional APIC X2APIC columns
tools/power turbostat: decode cpuid.1.HT
tools/power turbostat: fix show/hide issues resulting from mis-merge
PM / OPP: Update voltage in case freq == old_freq
cpufreq: intel_pstate: Fix scaling max/min limits with Turbo 3.0
cpufreq: kryo: Add module remove and exit
cpufreq: kryo: Fix possible error code dereference
PM / core: Fix supplier device runtime PM usage counter imbalance
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/pm/intel_pstate.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/admin-guide/pm/intel_pstate.rst b/Documentation/admin-guide/pm/intel_pstate.rst index ab2fe0eda1d7..8b9164990956 100644 --- a/Documentation/admin-guide/pm/intel_pstate.rst +++ b/Documentation/admin-guide/pm/intel_pstate.rst | |||
| @@ -410,7 +410,7 @@ argument is passed to the kernel in the command line. | |||
| 410 | That only is supported in some configurations, though (for example, if | 410 | That only is supported in some configurations, though (for example, if |
| 411 | the `HWP feature is enabled in the processor <Active Mode With HWP_>`_, | 411 | the `HWP feature is enabled in the processor <Active Mode With HWP_>`_, |
| 412 | the operation mode of the driver cannot be changed), and if it is not | 412 | the operation mode of the driver cannot be changed), and if it is not |
| 413 | supported in the current configuration, writes to this attribute with | 413 | supported in the current configuration, writes to this attribute will |
| 414 | fail with an appropriate error. | 414 | fail with an appropriate error. |
| 415 | 415 | ||
| 416 | Interpretation of Policy Attributes | 416 | Interpretation of Policy Attributes |