diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-09 13:12:29 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-09 13:12:29 +1000 |
| commit | b4f7acd415c3851c33df75d5bf8f7d28ed977133 (patch) | |
| tree | 62ac350b2458ec00a0a785efe79540740f6fcc03 /Documentation/kernel-parameters.txt | |
| parent | e690eec3b94717892c06046e54c4881db258e720 (diff) | |
| parent | 1e1d20ae4e3634d683eb8ef77111485efe4e1a74 (diff) | |
Merge commit 'acpi/test'
Conflicts:
arch/x86/kernel/process.c
arch/x86/mm/srat_32.c
drivers/acpi/processor_throttling.c
drivers/acpi/sleep/main.c
drivers/pci/pci.c
drivers/pci/pci.h
include/acpi/acpi_bus.h
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index f3aef1937929..cb2fa67de686 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -820,7 +820,7 @@ and is between 256 and 4096 characters. It is defined in the file See Documentation/ide/ide.txt. idle= [X86] - Format: idle=poll or idle=mwait + Format: idle=poll or idle=mwait, idle=halt, idle=nomwait Poll forces a polling idle loop that can slightly improves the performance of waking up a idle CPU, but will use a lot of power and make the system run hot. Not recommended. @@ -828,6 +828,9 @@ and is between 256 and 4096 characters. It is defined in the file to not use it because it doesn't save as much power as a normal idle loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same as idle=poll. + idle=halt. Halt is forced to be used for CPU idle. + In such case C2/C3 won't be used again. + idle=nomwait. Disable mwait for CPU C-states ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem Claim all unknown PCI IDE storage controllers. |