diff options
author | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /Documentation/kernel-parameters.txt | |
parent | a8f75ea70c58546205fb7673be41455b9da5d9a7 (diff) | |
parent | 120dd64cacd4fb796bca0acba3665553f1d9ecaa (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index a1ff28e0872..4f82c856667 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -170,11 +170,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
170 | acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA | 170 | acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA |
171 | Format: <irq>,<irq>... | 171 | Format: <irq>,<irq>... |
172 | 172 | ||
173 | acpi_new_pts_ordering [HW,ACPI] | ||
174 | Enforce the ACPI 2.0 ordering of the _PTS control | ||
175 | method wrt putting devices into low power states | ||
176 | default: pre ACPI 2.0 ordering of _PTS | ||
177 | |||
178 | acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT | 173 | acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT |
179 | 174 | ||
180 | acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS | 175 | acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS |
@@ -380,6 +375,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
380 | ccw_timeout_log [S390] | 375 | ccw_timeout_log [S390] |
381 | See Documentation/s390/CommonIO for details. | 376 | See Documentation/s390/CommonIO for details. |
382 | 377 | ||
378 | cgroup_disable= [KNL] Disable a particular controller | ||
379 | Format: {name of the controller(s) to disable} | ||
380 | {Currently supported controllers - "memory"} | ||
381 | |||
383 | checkreqprot [SELINUX] Set initial checkreqprot flag value. | 382 | checkreqprot [SELINUX] Set initial checkreqprot flag value. |
384 | Format: { "0" | "1" } | 383 | Format: { "0" | "1" } |
385 | See security/selinux/Kconfig help text. | 384 | See security/selinux/Kconfig help text. |
@@ -845,7 +844,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
845 | arch/alpha/kernel/core_marvel.c. | 844 | arch/alpha/kernel/core_marvel.c. |
846 | 845 | ||
847 | ip= [IP_PNP] | 846 | ip= [IP_PNP] |
848 | See Documentation/nfsroot.txt. | 847 | See Documentation/filesystems/nfsroot.txt. |
849 | 848 | ||
850 | ip2= [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards | 849 | ip2= [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards |
851 | See comment before ip2_setup() in | 850 | See comment before ip2_setup() in |
@@ -1201,10 +1200,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1201 | file if at all. | 1200 | file if at all. |
1202 | 1201 | ||
1203 | nfsaddrs= [NFS] | 1202 | nfsaddrs= [NFS] |
1204 | See Documentation/nfsroot.txt. | 1203 | See Documentation/filesystems/nfsroot.txt. |
1205 | 1204 | ||
1206 | nfsroot= [NFS] nfs root filesystem for disk-less boxes. | 1205 | nfsroot= [NFS] nfs root filesystem for disk-less boxes. |
1207 | See Documentation/nfsroot.txt. | 1206 | See Documentation/filesystems/nfsroot.txt. |
1208 | 1207 | ||
1209 | nfs.callback_tcpport= | 1208 | nfs.callback_tcpport= |
1210 | [NFS] set the TCP port on which the NFSv4 callback | 1209 | [NFS] set the TCP port on which the NFSv4 callback |