diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-08-28 20:58:16 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-08-28 20:58:16 +0200 |
| commit | ef7d960403ecd87276e12b69c26bf0fdd5f21a0e (patch) | |
| tree | 5d5030f349c107dc3098d05a311411c776439df5 /Documentation | |
| parent | PM: sleep: core: Fix the handling of pending runtime resume requests (diff) | |
| parent | cpufreq: Use WARN_ON_ONCE() for invalid relation (diff) | |
| download | wireguard-linux-ef7d960403ecd87276e12b69c26bf0fdd5f21a0e.tar.xz wireguard-linux-ef7d960403ecd87276e12b69c26bf0fdd5f21a0e.zip | |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq: Use WARN_ON_ONCE() for invalid relation
cpufreq: No need to verify cpufreq_driver in show_scaling_cur_freq()
Documentation: fix pm/intel_pstate build warning and wording
cpufreq: replace cpu_logical_map() with read_cpuid_mpir()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/pm/intel_pstate.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/admin-guide/pm/intel_pstate.rst b/Documentation/admin-guide/pm/intel_pstate.rst index 7adef969ffee..cdd1a9a7f9a2 100644 --- a/Documentation/admin-guide/pm/intel_pstate.rst +++ b/Documentation/admin-guide/pm/intel_pstate.rst @@ -564,8 +564,8 @@ Energy-Performance Preference (EPP) knob (if supported) or its Energy-Performance Bias (EPB) knob. It is also possible to write a positive integer value between 0 to 255, if the EPP feature is present. If the EPP feature is not present, writing integer value to this attribute is not -supported. In this case, user can use - "/sys/devices/system/cpu/cpu*/power/energy_perf_bias" interface. +supported. In this case, user can use the +"/sys/devices/system/cpu/cpu*/power/energy_perf_bias" interface. [Note that tasks may by migrated from one CPU to another by the scheduler's load-balancing algorithm and if different energy vs performance hints are |