aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2007-08-27 11:02:12 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-27 13:27:48 -0400
commit813409771731d80e6fa94199adf99f2269a4afc0 (patch)
treed417127b47e1d1f7e8ebe1b09a11a4fa5c36fba1 /init/main.c
parent88ede8209efd01b4a557ddd588875544954e170a (diff)
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.c2
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)
168 return 0; 168 return 0;
169} 169}
170 170
171early_param("maxcpus=", maxcpus); 171early_param("maxcpus", maxcpus);
172#else 172#else
173#define max_cpus NR_CPUS 173#define max_cpus NR_CPUS
174#endif 174#endif