diff options
author | Jan Beulich <jbeulich@novell.com> | 2007-07-21 11:10:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 21:37:09 -0400 |
commit | d567b6a955c2c1a6b0e8fc13ecddc7d4ac4900a2 (patch) | |
tree | 7920c076cc3dae5684c47e8c7d7b002247d0fe47 | |
parent | 74a1ddc597d83d5ca6541b15a15f80a3722e3a1e (diff) |
x86_64: remove unused variable maxcpus
.. and adjust documentation to properly reflect options that are
x86-64 specific.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | Documentation/x86_64/boot-options.txt | 6 | ||||
-rw-r--r-- | arch/x86_64/kernel/mpparse.c | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt index 6177d881983f..a4595b22e092 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt | |||
@@ -134,12 +134,6 @@ Non Executable Mappings | |||
134 | 134 | ||
135 | SMP | 135 | SMP |
136 | 136 | ||
137 | nosmp Only use a single CPU | ||
138 | |||
139 | maxcpus=NUMBER only use upto NUMBER CPUs | ||
140 | |||
141 | cpumask=MASK only use cpus with bits set in mask | ||
142 | |||
143 | additional_cpus=NUM Allow NUM more CPUs for hotplug | 137 | additional_cpus=NUM Allow NUM more CPUs for hotplug |
144 | (defaults are specified by the BIOS, see Documentation/x86_64/cpu-hotplug-spec) | 138 | (defaults are specified by the BIOS, see Documentation/x86_64/cpu-hotplug-spec) |
145 | 139 | ||
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c index 0ec84909d846..8bf0ca03ac8e 100644 --- a/arch/x86_64/kernel/mpparse.c +++ b/arch/x86_64/kernel/mpparse.c | |||
@@ -32,7 +32,6 @@ | |||
32 | 32 | ||
33 | /* Have we found an MP table */ | 33 | /* Have we found an MP table */ |
34 | int smp_found_config; | 34 | int smp_found_config; |
35 | unsigned int __initdata maxcpus = NR_CPUS; | ||
36 | 35 | ||
37 | /* | 36 | /* |
38 | * Various Linux-internal data structures created from the | 37 | * Various Linux-internal data structures created from the |