aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt22
1 files changed, 10 insertions, 12 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 975f029be25c..4d175c751246 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -468,9 +468,6 @@ and is between 256 and 4096 characters. It is defined in the file
468 Format: 468 Format:
469 <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>] 469 <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]
470 470
471 cpia_pp= [HW,PPT]
472 Format: { parport<nr> | auto | none }
473
474 crashkernel=nn[KMG]@ss[KMG] 471 crashkernel=nn[KMG]@ss[KMG]
475 [KNL] Reserve a chunk of physical memory to 472 [KNL] Reserve a chunk of physical memory to
476 hold a kernel to switch to with kexec on panic. 473 hold a kernel to switch to with kexec on panic.
@@ -952,14 +949,10 @@ and is between 256 and 4096 characters. It is defined in the file
952 Format: <1-256> 949 Format: <1-256>
953 950
954 maxcpus= [SMP] Maximum number of processors that an SMP kernel 951 maxcpus= [SMP] Maximum number of processors that an SMP kernel
955 should make use of. 952 should make use of. maxcpus=n : n >= 0 limits the
956 Using "nosmp" or "maxcpus=0" will disable SMP 953 kernel to using 'n' processors. n=0 is a special case,
957 entirely (the MPS table probe still happens, though). 954 it is equivalent to "nosmp", which also disables
958 A command-line option of "maxcpus=<NUM>", where <NUM> 955 the IO APIC.
959 is an integer greater than 0, limits the maximum number
960 of CPUs activated in SMP mode to <NUM>.
961 Using "maxcpus=1" on an SMP kernel is the trivial
962 case of an SMP kernel with only one CPU.
963 956
964 max_addr=[KMG] [KNL,BOOT,ia64] All physical memory greater than or 957 max_addr=[KMG] [KNL,BOOT,ia64] All physical memory greater than or
965 equal to this physical address is ignored. 958 equal to this physical address is ignored.
@@ -1184,7 +1177,8 @@ and is between 256 and 4096 characters. It is defined in the file
1184 1177
1185 nosep [BUGS=X86-32] Disables x86 SYSENTER/SYSEXIT support. 1178 nosep [BUGS=X86-32] Disables x86 SYSENTER/SYSEXIT support.
1186 1179
1187 nosmp [SMP] Tells an SMP kernel to act as a UP kernel. 1180 nosmp [SMP] Tells an SMP kernel to act as a UP kernel,
1181 and disable the IO APIC. legacy for "maxcpus=0".
1188 1182
1189 nosoftlockup [KNL] Disable the soft-lockup detector. 1183 nosoftlockup [KNL] Disable the soft-lockup detector.
1190 1184
@@ -1826,6 +1820,10 @@ and is between 256 and 4096 characters. It is defined in the file
1826 -1: disable all active trip points in all thermal zones 1820 -1: disable all active trip points in all thermal zones
1827 <degrees C>: override all lowest active trip points 1821 <degrees C>: override all lowest active trip points
1828 1822
1823 thermal.crt= [HW,ACPI]
1824 -1: disable all critical trip points in all thermal zones
1825 <degrees C>: lower all critical trip points
1826
1829 thermal.nocrt= [HW,ACPI] 1827 thermal.nocrt= [HW,ACPI]
1830 Set to disable actions on ACPI thermal zone 1828 Set to disable actions on ACPI thermal zone
1831 critical and hot trip points. 1829 critical and hot trip points.