Commit d5176123 authored Feb 27, 2006 by Brian Magnuson Committed by Linus Torvalds Feb 26, 2006

[PATCH] fix build on x86_64 with !CONFIG_HOTPLUG_CPU



The commit e2c03888 added
setup_additional_cpus to setup.c but this is only defined if
CONFIG_HOTPLUG_CPU is set.  This patch changes the #ifdef to reflect that.

Signed-off-by: Brian Magnuson <magnuson@rcn.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent fc5870f6

arch/x86_64/kernel/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -424,7 +424,7 @@ static __init void parse_cmdline_early (char ** cmdline_p)
		elfcorehdr_addr = memparse(from+11, &from);
		#endif

		#ifdef CONFIG_SMP
		#ifdef CONFIG_HOTPLUG_CPU
		else if (!memcmp(from, "additional_cpus=", 16))
		setup_additional_cpus(from+16);
		#endif