aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2008-12-19 13:57:32 -0500
committerLen Brown <len.brown@intel.com>2008-12-19 15:57:56 -0500
commitada9cfdd158abb8169873dc8e5ae39b1ec6ffa8c (patch)
tree863875a5f09231ece677cba4df6d80b658f89051
parentbaa5835df10254762aedb6cb23a9c1508f969736 (diff)
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: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--Documentation/kernel-parameters.txt40
1 files changed, 22 insertions, 18 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 1d089eeff3cf..350e71960a96 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -151,15 +151,16 @@ and is between 256 and 4096 characters. It is defined in the file
151 acpi_sleep= [HW,ACPI] Sleep options 151 acpi_sleep= [HW,ACPI] Sleep options
152 Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, 152 Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
153 old_ordering, s4_nonvs } 153 old_ordering, s4_nonvs }
154 See Documentation/power/video.txt for s3_bios and s3_mode. 154 See Documentation/power/video.txt for information on
155 s3_bios and s3_mode.
155 s3_beep is for debugging; it makes the PC's speaker beep 156 s3_beep is for debugging; it makes the PC's speaker beep
156 as soon as the kernel's real-mode entry point is called. 157 as soon as the kernel's real-mode entry point is called.
157 s4_nohwsig prevents ACPI hardware signature from being 158 s4_nohwsig prevents ACPI hardware signature from being
158 used during resume from hibernation. 159 used during resume from hibernation.
159 old_ordering causes the ACPI 1.0 ordering of the _PTS 160 old_ordering causes the ACPI 1.0 ordering of the _PTS
160 control method, wrt putting devices into low power 161 control method, with respect to putting devices into
161 states, to be enforced (the ACPI 2.0 ordering of _PTS is 162 low power states, to be enforced (the ACPI 2.0 ordering
162 used by default). 163 of _PTS is used by default).
163 s4_nonvs prevents the kernel from saving/restoring the 164 s4_nonvs prevents the kernel from saving/restoring the
164 ACPI NVS memory during hibernation. 165 ACPI NVS memory during hibernation.
165 166
@@ -196,7 +197,7 @@ and is between 256 and 4096 characters. It is defined in the file
196 acpi_skip_timer_override [HW,ACPI] 197 acpi_skip_timer_override [HW,ACPI]
197 Recognize and ignore IRQ0/pin2 Interrupt Override. 198 Recognize and ignore IRQ0/pin2 Interrupt Override.
198 For broken nForce2 BIOS resulting in XT-PIC timer. 199 For broken nForce2 BIOS resulting in XT-PIC timer.
199 acpi_use_timer_override [HW,ACPI} 200 acpi_use_timer_override [HW,ACPI]
200 Use timer override. For some broken Nvidia NF5 boards 201 Use timer override. For some broken Nvidia NF5 boards
201 that require a timer override, but don't have 202 that require a timer override, but don't have
202 HPET 203 HPET
@@ -860,17 +861,19 @@ and is between 256 and 4096 characters. It is defined in the file
860 See Documentation/ide/ide.txt. 861 See Documentation/ide/ide.txt.
861 862
862 idle= [X86] 863 idle= [X86]
863 Format: idle=poll or idle=mwait, idle=halt, idle=nomwait 864 Format: idle=poll, idle=mwait, idle=halt, idle=nomwait
864 Poll forces a polling idle loop that can slightly improves the performance 865 Poll forces a polling idle loop that can slightly
865 of waking up a idle CPU, but will use a lot of power and make the system 866 improve the performance of waking up a idle CPU, but
866 run hot. Not recommended. 867 will use a lot of power and make the system run hot.
867 idle=mwait. On systems which support MONITOR/MWAIT but the kernel chose 868 Not recommended.
868 to not use it because it doesn't save as much power as a normal idle 869 idle=mwait: On systems which support MONITOR/MWAIT but
869 loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same 870 the kernel chose to not use it because it doesn't save
870 as idle=poll. 871 as much power as a normal idle loop, use the
871 idle=halt. Halt is forced to be used for CPU idle. 872 MONITOR/MWAIT idle loop anyways. Performance should be
873 the same as idle=poll.
874 idle=halt: Halt is forced to be used for CPU idle.
872 In such case C2/C3 won't be used again. 875 In such case C2/C3 won't be used again.
873 idle=nomwait. Disable mwait for CPU C-states 876 idle=nomwait: Disable mwait for CPU C-states
874 877
875 ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem 878 ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem
876 Claim all unknown PCI IDE storage controllers. 879 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 lapic [X86-32,APIC] Enable the local APIC even if BIOS 1055 lapic [X86-32,APIC] Enable the local APIC even if BIOS
1053 disabled it. 1056 disabled it.
1054 1057
1055 lapic_timer_c2_ok [X86-32,x86-64,APIC] trust the local apic timer in 1058 lapic_timer_c2_ok [X86-32,x86-64,APIC] trust the local apic timer
1056 C2 power state. 1059 in C2 power state.
1057 1060
1058 libata.dma= [LIBATA] DMA control 1061 libata.dma= [LIBATA] DMA control
1059 libata.dma=0 Disable all PATA and SATA DMA 1062 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 2244
2242 thermal.psv= [HW,ACPI] 2245 thermal.psv= [HW,ACPI]
2243 -1: disable all passive trip points 2246 -1: disable all passive trip points
2244 <degrees C>: override all passive trip points to this value 2247 <degrees C>: override all passive trip points to this
2248 value
2245 2249
2246 thermal.tzp= [HW,ACPI] 2250 thermal.tzp= [HW,ACPI]
2247 Specify global default ACPI thermal zone polling rate 2251 Specify global default ACPI thermal zone polling rate