提交 ada9cfdd 编写于 作者: R Randy Dunlap 提交者: Len Brown

doc: fix kernel-parameters.txt formatting

Spell out "wrt".  I suspect plenty of people won't know
what that means.

Fix a '}' that should be a ']'.

Reformat long lines into shorter lines.
Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: NLen Brown <len.brown@intel.com>
上级 baa5835d
...@@ -151,15 +151,16 @@ and is between 256 and 4096 characters. It is defined in the file ...@@ -151,15 +151,16 @@ and is between 256 and 4096 characters. It is defined in the file
acpi_sleep= [HW,ACPI] Sleep options acpi_sleep= [HW,ACPI] Sleep options
Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
old_ordering, s4_nonvs } old_ordering, s4_nonvs }
See Documentation/power/video.txt for s3_bios and s3_mode. See Documentation/power/video.txt for information on
s3_bios and s3_mode.
s3_beep is for debugging; it makes the PC's speaker beep s3_beep is for debugging; it makes the PC's speaker beep
as soon as the kernel's real-mode entry point is called. as soon as the kernel's real-mode entry point is called.
s4_nohwsig prevents ACPI hardware signature from being s4_nohwsig prevents ACPI hardware signature from being
used during resume from hibernation. used during resume from hibernation.
old_ordering causes the ACPI 1.0 ordering of the _PTS old_ordering causes the ACPI 1.0 ordering of the _PTS
control method, wrt putting devices into low power control method, with respect to putting devices into
states, to be enforced (the ACPI 2.0 ordering of _PTS is low power states, to be enforced (the ACPI 2.0 ordering
used by default). of _PTS is used by default).
s4_nonvs prevents the kernel from saving/restoring the s4_nonvs prevents the kernel from saving/restoring the
ACPI NVS memory during hibernation. ACPI NVS memory during hibernation.
...@@ -196,7 +197,7 @@ and is between 256 and 4096 characters. It is defined in the file ...@@ -196,7 +197,7 @@ and is between 256 and 4096 characters. It is defined in the file
acpi_skip_timer_override [HW,ACPI] acpi_skip_timer_override [HW,ACPI]
Recognize and ignore IRQ0/pin2 Interrupt Override. Recognize and ignore IRQ0/pin2 Interrupt Override.
For broken nForce2 BIOS resulting in XT-PIC timer. For broken nForce2 BIOS resulting in XT-PIC timer.
acpi_use_timer_override [HW,ACPI} acpi_use_timer_override [HW,ACPI]
Use timer override. For some broken Nvidia NF5 boards Use timer override. For some broken Nvidia NF5 boards
that require a timer override, but don't have that require a timer override, but don't have
HPET HPET
...@@ -860,17 +861,19 @@ and is between 256 and 4096 characters. It is defined in the file ...@@ -860,17 +861,19 @@ and is between 256 and 4096 characters. It is defined in the file
See Documentation/ide/ide.txt. See Documentation/ide/ide.txt.
idle= [X86] idle= [X86]
Format: idle=poll or idle=mwait, idle=halt, idle=nomwait Format: idle=poll, idle=mwait, idle=halt, idle=nomwait
Poll forces a polling idle loop that can slightly improves the performance Poll forces a polling idle loop that can slightly
of waking up a idle CPU, but will use a lot of power and make the system improve the performance of waking up a idle CPU, but
run hot. Not recommended. will use a lot of power and make the system run hot.
idle=mwait. On systems which support MONITOR/MWAIT but the kernel chose Not recommended.
to not use it because it doesn't save as much power as a normal idle idle=mwait: On systems which support MONITOR/MWAIT but
loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same the kernel chose to not use it because it doesn't save
as idle=poll. as much power as a normal idle loop, use the
idle=halt. Halt is forced to be used for CPU idle. 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. In such case C2/C3 won't be used again.
idle=nomwait. Disable mwait for CPU C-states idle=nomwait: Disable mwait for CPU C-states
ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem
Claim all unknown PCI IDE storage controllers. Claim all unknown PCI IDE storage controllers.
...@@ -1052,8 +1055,8 @@ and is between 256 and 4096 characters. It is defined in the file ...@@ -1052,8 +1055,8 @@ and is between 256 and 4096 characters. It is defined in the file
lapic [X86-32,APIC] Enable the local APIC even if BIOS lapic [X86-32,APIC] Enable the local APIC even if BIOS
disabled it. disabled it.
lapic_timer_c2_ok [X86-32,x86-64,APIC] trust the local apic timer in lapic_timer_c2_ok [X86-32,x86-64,APIC] trust the local apic timer
C2 power state. in C2 power state.
libata.dma= [LIBATA] DMA control libata.dma= [LIBATA] DMA control
libata.dma=0 Disable all PATA and SATA DMA libata.dma=0 Disable all PATA and SATA DMA
...@@ -2241,7 +2244,8 @@ and is between 256 and 4096 characters. It is defined in the file ...@@ -2241,7 +2244,8 @@ and is between 256 and 4096 characters. It is defined in the file
thermal.psv= [HW,ACPI] thermal.psv= [HW,ACPI]
-1: disable all passive trip points -1: disable all passive trip points
<degrees C>: override all passive trip points to this value <degrees C>: override all passive trip points to this
value
thermal.tzp= [HW,ACPI] thermal.tzp= [HW,ACPI]
Specify global default ACPI thermal zone polling rate Specify global default ACPI thermal zone polling rate
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册