diff options
| author | Hugh Dickins <hugh@veritas.com> | 2007-08-27 16:02:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-27 10:27:48 -0700 |
| commit | 813409771731d80e6fa94199adf99f2269a4afc0 (patch) | |
| tree | d417127b47e1d1f7e8ebe1b09a11a4fa5c36fba1 /init/main.c | |
| parent | 88ede8209efd01b4a557ddd588875544954e170a (diff) | |
| download | linux-stable-813409771731d80e6fa94199adf99f2269a4afc0.tar.gz linux-stable-813409771731d80e6fa94199adf99f2269a4afc0.tar.bz2 linux-stable-813409771731d80e6fa94199adf99f2269a4afc0.zip | |
fix maxcpus=N parsing
Commit 61ec7567db103d537329b0db9a887db570431ff4 ('ACPI: boot correctly
with "nosmp" or "maxcpus=0"') broke 'maxcpus=' handling on x86[-64].
maxcpus=N is now having no effect on x86_64, and freezing bootup on i386
(because of inconsistency with the separate maxcpus parsing down in
arch/i386, I guess). That's because early_param parsing is a little
different from __setup parsing, and needs the "=" omitted: then it seems
to work as the original commit intended (no mention of IO-APIC in
/proc/interrupts when maxcpus=0).
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Len Brown <len.brown@intel.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index cc0653ec081d..450e6ee52ab6 100644 --- a/init/main.c +++ b/init/main.c @@ -168,7 +168,7 @@ static int __init maxcpus(char *str) return 0; } -early_param("maxcpus=", maxcpus); +early_param("maxcpus", maxcpus); #else #define max_cpus NR_CPUS #endif |