diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-17 13:38:13 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-17 13:38:13 (GMT) |
commit | fdbe0946d4c35d4cc784cfe0a5322708cfb7ade8 (patch) | |
tree | fca3ebcb96916e052b4e569d36900fc6bff2b2d7 /Documentation | |
parent | 60a406d1de227037193db6790a1a8650ea51dc93 (diff) | |
parent | 6be264986152c498562f26b15ed73c70aa37ce48 (diff) | |
download | linux-fdbe0946d4c35d4cc784cfe0a5322708cfb7ade8.tar.xz |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq / intel_pstate: Add kernel command line option disable intel_pstate.
cpufreq / intel_pstate: Change to disallow module build
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 6c72381..41c5d9e 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1131,6 +1131,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 0 disables intel_idle and fall back on acpi_idle. 1 to 6 specify maximum depth of C-state. + intel_pstate= [X86] + disable + Do not enable intel_pstate as the default + scaling driver for the supported processors + intremap= [X86-64, Intel-IOMMU] on enable Interrupt Remapping (default) off disable Interrupt Remapping |