aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-20 05:59:59 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-20 05:59:59 -0500
commitc5580a7ecb859c6821dd761c95fa150ec7695ae1 (patch)
tree18ca034a53c22e12912e55f5858d1b4a235cedd7 /Documentation
parentb04a92e1601eb6df3a3b6599e7fb7ee021eef2cb (diff)
parentd33a73c81241e3d9ab8da2d0558429bdd5b4ef9a (diff)
Merge branch 'forcedeth'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cpu-hotplug.txt16
1 files changed, 11 insertions, 5 deletions
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index e05278087ffa..e71bc6cbbc5e 100644
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -11,6 +11,8 @@
11 Joel Schopp <jschopp@austin.ibm.com> 11 Joel Schopp <jschopp@austin.ibm.com>
12 ia64/x86_64: 12 ia64/x86_64:
13 Ashok Raj <ashok.raj@intel.com> 13 Ashok Raj <ashok.raj@intel.com>
14 s390:
15 Heiko Carstens <heiko.carstens@de.ibm.com>
14 16
15Authors: Ashok Raj <ashok.raj@intel.com> 17Authors: Ashok Raj <ashok.raj@intel.com>
16Lots of feedback: Nathan Lynch <nathanl@austin.ibm.com>, 18Lots of feedback: Nathan Lynch <nathanl@austin.ibm.com>,
@@ -44,11 +46,9 @@ maxcpus=n Restrict boot time cpus to n. Say if you have 4 cpus, using
44 maxcpus=2 will only boot 2. You can choose to bring the 46 maxcpus=2 will only boot 2. You can choose to bring the
45 other cpus later online, read FAQ's for more info. 47 other cpus later online, read FAQ's for more info.
46 48
47additional_cpus*=n Use this to limit hotpluggable cpus. This option sets 49additional_cpus=n [x86_64, s390 only] use this to limit hotpluggable cpus.
48 cpu_possible_map = cpu_present_map + additional_cpus 50 This option sets
49 51 cpu_possible_map = cpu_present_map + additional_cpus
50(*) Option valid only for following architectures
51- x86_64, ia64
52 52
53ia64 and x86_64 use the number of disabled local apics in ACPI tables MADT 53ia64 and x86_64 use the number of disabled local apics in ACPI tables MADT
54to determine the number of potentially hot-pluggable cpus. The implementation 54to determine the number of potentially hot-pluggable cpus. The implementation
@@ -58,6 +58,12 @@ mark such hot-pluggable cpus as disabled entries, one could use this
58parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map. 58parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map.
59 59
60 60
61possible_cpus=n [s390 only] use this to set hotpluggable cpus.
62 This option sets possible_cpus bits in
63 cpu_possible_map. Thus keeping the numbers of bits set
64 constant even if the machine gets rebooted.
65 This option overrides additional_cpus.
66
61CPU maps and such 67CPU maps and such
62----------------- 68-----------------
63[More on cpumaps and primitive to manipulate, please check 69[More on cpumaps and primitive to manipulate, please check