diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 03:54:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 03:54:15 -0400 |
| commit | 35e51fe82ddcd8fb7f129d6dd8491c097d388665 (patch) | |
| tree | d6dd5e860c0e68a1af7976990c7d624e7362415d /Documentation | |
| parent | c0c770e610cc4cdcd66c7e939bdf89cc3e72f79d (diff) | |
| parent | a0bfa1373859e9d11dc92561a8667588803e42d8 (diff) | |
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.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 865e39f1850c..e279b7242912 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. | |||
| 551 | /proc/<pid>/coredump_filter. | 551 | /proc/<pid>/coredump_filter. |
| 552 | See also Documentation/filesystems/proc.txt. | 552 | See also Documentation/filesystems/proc.txt. |
| 553 | 553 | ||
| 554 | cpuidle.off=1 [CPU_IDLE] | ||
| 555 | disable the cpuidle sub-system | ||
| 556 | |||
| 554 | cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver | 557 | cpcihp_generic= [HW,PCI] Generic port I/O CompactPCI driver |
| 555 | Format: | 558 | Format: |
| 556 | <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>] | 559 | <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>] |