diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-22 07:08:57 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-22 07:08:57 -0400 |
commit | 0b88641f1bafdbd087d5e63987a30cc0eadd63b9 (patch) | |
tree | 81dcf756db373444140bb2623584710c628e3048 /Documentation/kernel-parameters.txt | |
parent | fbdbf709938d155c719c76b9894d28342632c797 (diff) | |
parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) |
Merge commit 'v2.6.27-rc7' into x86/debug
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 51 |
1 files changed, 40 insertions, 11 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 8679e80b9fc4..82a079d40970 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -87,7 +87,8 @@ parameter is applicable: | |||
87 | SH SuperH architecture is enabled. | 87 | SH SuperH architecture is enabled. |
88 | SMP The kernel is an SMP kernel. | 88 | SMP The kernel is an SMP kernel. |
89 | SPARC Sparc architecture is enabled. | 89 | SPARC Sparc architecture is enabled. |
90 | SWSUSP Software suspend is enabled. | 90 | SWSUSP Software suspend (hibernation) is enabled. |
91 | SUSPEND System suspend states are enabled. | ||
91 | TS Appropriate touchscreen support is enabled. | 92 | TS Appropriate touchscreen support is enabled. |
92 | USB USB support is enabled. | 93 | USB USB support is enabled. |
93 | USBHID USB Human Interface Device support is enabled. | 94 | USBHID USB Human Interface Device support is enabled. |
@@ -147,10 +148,12 @@ and is between 256 and 4096 characters. It is defined in the file | |||
147 | default: 0 | 148 | default: 0 |
148 | 149 | ||
149 | acpi_sleep= [HW,ACPI] Sleep options | 150 | acpi_sleep= [HW,ACPI] Sleep options |
150 | Format: { s3_bios, s3_mode, s3_beep, old_ordering } | 151 | Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, old_ordering } |
151 | See Documentation/power/video.txt for s3_bios and s3_mode. | 152 | See Documentation/power/video.txt for s3_bios and s3_mode. |
152 | s3_beep is for debugging; it makes the PC's speaker beep | 153 | s3_beep is for debugging; it makes the PC's speaker beep |
153 | as soon as the kernel's real-mode entry point is called. | 154 | as soon as the kernel's real-mode entry point is called. |
155 | s4_nohwsig prevents ACPI hardware signature from being | ||
156 | used during resume from hibernation. | ||
154 | old_ordering causes the ACPI 1.0 ordering of the _PTS | 157 | old_ordering causes the ACPI 1.0 ordering of the _PTS |
155 | control method, wrt putting devices into low power | 158 | control method, wrt putting devices into low power |
156 | states, to be enforced (the ACPI 2.0 ordering of _PTS is | 159 | states, to be enforced (the ACPI 2.0 ordering of _PTS is |
@@ -362,6 +365,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
362 | no delay (0). | 365 | no delay (0). |
363 | Format: integer | 366 | Format: integer |
364 | 367 | ||
368 | bootmem_debug [KNL] Enable bootmem allocator debug messages. | ||
369 | |||
365 | bttv.card= [HW,V4L] bttv (bt848 + bt878 based grabber cards) | 370 | bttv.card= [HW,V4L] bttv (bt848 + bt878 based grabber cards) |
366 | bttv.radio= Most important insmod options are available as | 371 | bttv.radio= Most important insmod options are available as |
367 | kernel args too. | 372 | kernel args too. |
@@ -774,8 +779,22 @@ and is between 256 and 4096 characters. It is defined in the file | |||
774 | hisax= [HW,ISDN] | 779 | hisax= [HW,ISDN] |
775 | See Documentation/isdn/README.HiSax. | 780 | See Documentation/isdn/README.HiSax. |
776 | 781 | ||
777 | hugepages= [HW,X86-32,IA-64] Maximal number of HugeTLB pages. | 782 | hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot. |
778 | hugepagesz= [HW,IA-64,PPC] The size of the HugeTLB pages. | 783 | hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages. |
784 | On x86-64 and powerpc, this option can be specified | ||
785 | multiple times interleaved with hugepages= to reserve | ||
786 | huge pages of different sizes. Valid pages sizes on | ||
787 | x86-64 are 2M (when the CPU supports "pse") and 1G | ||
788 | (when the CPU supports the "pdpe1gb" cpuinfo flag) | ||
789 | Note that 1GB pages can only be allocated at boot time | ||
790 | using hugepages= and not freed afterwards. | ||
791 | default_hugepagesz= | ||
792 | [same as hugepagesz=] The size of the default | ||
793 | HugeTLB page size. This is the size represented by | ||
794 | the legacy /proc/ hugepages APIs, used for SHM, and | ||
795 | default size when mounting hugetlbfs filesystems. | ||
796 | Defaults to the default architecture's huge page size | ||
797 | if not specified. | ||
779 | 798 | ||
780 | i8042.direct [HW] Put keyboard port into non-translated mode | 799 | i8042.direct [HW] Put keyboard port into non-translated mode |
781 | i8042.dumbkbd [HW] Pretend that controller can only read data from | 800 | i8042.dumbkbd [HW] Pretend that controller can only read data from |
@@ -1055,6 +1074,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1055 | 1074 | ||
1056 | * [no]ncq: Turn on or off NCQ. | 1075 | * [no]ncq: Turn on or off NCQ. |
1057 | 1076 | ||
1077 | * nohrst, nosrst, norst: suppress hard, soft | ||
1078 | and both resets. | ||
1079 | |||
1058 | If there are multiple matching configurations changing | 1080 | If there are multiple matching configurations changing |
1059 | the same attribute, the last one is used. | 1081 | the same attribute, the last one is used. |
1060 | 1082 | ||
@@ -1225,6 +1247,14 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1225 | 1247 | ||
1226 | mga= [HW,DRM] | 1248 | mga= [HW,DRM] |
1227 | 1249 | ||
1250 | mminit_loglevel= | ||
1251 | [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this | ||
1252 | parameter allows control of the logging verbosity for | ||
1253 | the additional memory initialisation checks. A value | ||
1254 | of 0 disables mminit logging and a level of 4 will | ||
1255 | log everything. Information is printed at KERN_DEBUG | ||
1256 | so loglevel=8 may also need to be specified. | ||
1257 | |||
1228 | mousedev.tap_time= | 1258 | mousedev.tap_time= |
1229 | [MOUSE] Maximum time between finger touching and | 1259 | [MOUSE] Maximum time between finger touching and |
1230 | leaving touchpad surface for touch to be considered | 1260 | leaving touchpad surface for touch to be considered |
@@ -2107,6 +2137,12 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2107 | 2137 | ||
2108 | tdfx= [HW,DRM] | 2138 | tdfx= [HW,DRM] |
2109 | 2139 | ||
2140 | test_suspend= [SUSPEND] | ||
2141 | Specify "mem" (for Suspend-to-RAM) or "standby" (for | ||
2142 | standby suspend) as the system sleep state to briefly | ||
2143 | enter during system startup. The system is woken from | ||
2144 | this state using a wakeup-capable RTC alarm. | ||
2145 | |||
2110 | thash_entries= [KNL,NET] | 2146 | thash_entries= [KNL,NET] |
2111 | Set number of hash buckets for TCP connection | 2147 | Set number of hash buckets for TCP connection |
2112 | 2148 | ||
@@ -2134,13 +2170,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2134 | <deci-seconds>: poll all this frequency | 2170 | <deci-seconds>: poll all this frequency |
2135 | 0: no polling (default) | 2171 | 0: no polling (default) |
2136 | 2172 | ||
2137 | tipar.timeout= [HW,PPT] | ||
2138 | Set communications timeout in tenths of a second | ||
2139 | (default 15). | ||
2140 | |||
2141 | tipar.delay= [HW,PPT] | ||
2142 | Set inter-bit delay in microseconds (default 10). | ||
2143 | |||
2144 | tmscsim= [HW,SCSI] | 2173 | tmscsim= [HW,SCSI] |
2145 | See comment before function dc390_setup() in | 2174 | See comment before function dc390_setup() in |
2146 | drivers/scsi/tmscsim.c. | 2175 | drivers/scsi/tmscsim.c. |