summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-17 08:16:35 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-17 08:16:35 -0800
commit759b650f54ed13e9b3d6c064c763a72ee09c74dd (patch)
tree173f08e5432e169c00a40a4d2296d965fe8f9c22 /Documentation
parent69454e6991091d0d6eb7461653f2695d985e1a74 (diff)
parent8f8b1138fc9f65e3591aac83a4ee394fef34ac1d (diff)
downloadlinux-759b650f54ed13e9b3d6c064c763a72ee09c74dd.tar.gz
linux-759b650f54ed13e9b3d6c064c763a72ee09c74dd.tar.bz2
linux-759b650f54ed13e9b3d6c064c763a72ee09c74dd.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cpu-hotplug.txt14
1 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index 08c5d04f3086..e05278087ffa 100644
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -44,10 +44,20 @@ maxcpus=n Restrict boot time cpus to n. Say if you have 4 cpus, using
maxcpus=2 will only boot 2. You can choose to bring the
other cpus later online, read FAQ's for more info.
-additional_cpus=n [x86_64 only] use this to limit hotpluggable cpus.
- This option sets
+additional_cpus*=n Use this to limit hotpluggable cpus. This option sets
cpu_possible_map = cpu_present_map + additional_cpus
+(*) Option valid only for following architectures
+- x86_64, ia64
+
+ia64 and x86_64 use the number of disabled local apics in ACPI tables MADT
+to determine the number of potentially hot-pluggable cpus. The implementation
+should only rely on this to count the #of cpus, but *MUST* not rely on the
+apicid values in those tables for disabled apics. In the event BIOS doesnt
+mark such hot-pluggable cpus as disabled entries, one could use this
+parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map.
+
+
CPU maps and such
-----------------
[More on cpumaps and primitive to manipulate, please check