summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-03 21:54:15 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-03 21:54:15 -1000
commit35e51fe82ddcd8fb7f129d6dd8491c097d388665 (patch)
treed6dd5e860c0e68a1af7976990c7d624e7362415d /Documentation
parentc0c770e610cc4cdcd66c7e939bdf89cc3e72f79d (diff)
parenta0bfa1373859e9d11dc92561a8667588803e42d8 (diff)
downloadop-kernel-dev-35e51fe82ddcd8fb7f129d6dd8491c097d388665.zip
op-kernel-dev-35e51fe82ddcd8fb7f129d6dd8491c097d388665.tar.gz
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6: cpuidle: stop depending on pm_idle x86 idle: move mwait_idle_with_hints() to where it is used cpuidle: replace xen access to x86 pm_idle and default_idle cpuidle: create bootparam "cpuidle.off=1" mrst_pmu: driver for Intel Moorestown Power Management Unit
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 865e39f..e279b72 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -551,6 +551,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
/proc/<pid>/coredump_filter.
See also Documentation/filesystems/proc.txt.
+ cpuidle.off=1 [CPU_IDLE]
+ disable the cpuidle sub-system
+
cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver
Format:
<first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]
OpenPOWER on IntegriCloud