From d71f833ef80dcd0e4164152666b6bcc6211993da Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Sat, 21 Jul 2007 17:10:23 +0200 Subject: [PATCH] --- yaml --- r: 62380 b: refs/heads/master c: d567b6a955c2c1a6b0e8fc13ecddc7d4ac4900a2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/x86_64/boot-options.txt | 6 ------ trunk/arch/x86_64/kernel/mpparse.c | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index e1a29f8cfc0a..f726d1dcf6d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74a1ddc597d83d5ca6541b15a15f80a3722e3a1e +refs/heads/master: d567b6a955c2c1a6b0e8fc13ecddc7d4ac4900a2 diff --git a/trunk/Documentation/x86_64/boot-options.txt b/trunk/Documentation/x86_64/boot-options.txt index 6177d881983f..a4595b22e092 100644 --- a/trunk/Documentation/x86_64/boot-options.txt +++ b/trunk/Documentation/x86_64/boot-options.txt @@ -134,12 +134,6 @@ Non Executable Mappings SMP - nosmp Only use a single CPU - - maxcpus=NUMBER only use upto NUMBER CPUs - - cpumask=MASK only use cpus with bits set in mask - additional_cpus=NUM Allow NUM more CPUs for hotplug (defaults are specified by the BIOS, see Documentation/x86_64/cpu-hotplug-spec) diff --git a/trunk/arch/x86_64/kernel/mpparse.c b/trunk/arch/x86_64/kernel/mpparse.c index 0ec84909d846..8bf0ca03ac8e 100644 --- a/trunk/arch/x86_64/kernel/mpparse.c +++ b/trunk/arch/x86_64/kernel/mpparse.c @@ -32,7 +32,6 @@ /* Have we found an MP table */ int smp_found_config; -unsigned int __initdata maxcpus = NR_CPUS; /* * Various Linux-internal data structures created from the