From: Brian Magnuson <magnuson@rcn.com>
Date: Mon, 27 Feb 2006 03:02:04 +0000 (+0100)
Subject: [PATCH] fix build on x86_64 with !CONFIG_HOTPLUG_CPU
X-Git-Tag: v2.6.16-rc5~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d51761233d9e3be4cdf10f7482a50463bbd78c78;p=linux-2.6-omap-h63xx.git

[PATCH] fix build on x86_64 with !CONFIG_HOTPLUG_CPU

The commit e2c0388866dc12bef56b178b958f9b778fe6c687 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>
---

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 5de7eaf5d97..aa55e3cec66 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -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