summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-03-09 15:12:27 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-03-09 15:12:27 +0100
commitfd8e57d5d3041a93b87bb892d7819cd89d7445db (patch)
treeab0adb8018c4a745388705b3a88c2a365d3eeea0 /Documentation
parentc1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff)
parenta240c4aa5d0f9c8bb0db380ab9c1ec1f68b923ad (diff)
downloadlinux-fd8e57d5d3041a93b87bb892d7819cd89d7445db.tar.bz2
Merge branch 'pm-cpufreq'
* pm-cpufreq: cpufreq: intel_pstate: Do not reinit performance limits in ->setpolicy cpufreq: intel_pstate: Fix intel_pstate_verify_policy() cpufreq: intel_pstate: Fix global settings in active mode cpufreq: Add the "cpufreq.off=1" cmdline option cpufreq: intel_pstate: Avoid triggering cpu_frequency tracepoint unnecessarily cpufreq: intel_pstate: Fix intel_cpufreq_verify_policy() cpufreq: intel_pstate: Do not use performance_limits in passive mode
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 986e44387dad..41851d42b84d 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -653,6 +653,9 @@
cpuidle.off=1 [CPU_IDLE]
disable the cpuidle sub-system
+ cpufreq.off=1 [CPU_FREQ]
+ disable the cpufreq sub-system
+
cpu_init_udelay=N
[X86] Delay for N microsec between assert and de-assert
of APIC INIT to start processors. This delay occurs