Commit 81340977 authored Aug 27, 2007 by Hugh Dickins Committed by Linus Torvalds Aug 27, 2007

fix maxcpus=N parsing



Commit 61ec7567 ('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>

parent 88ede820

init/main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message