aboutsummaryrefslogtreecommitdiff
path: root/kernel/cpu.c
diff options
context:
space:
mode:
authorChen Gong <gong.chen@linux.intel.com>2010-03-05 13:42:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-06 11:26:28 -0800
commit87d5e0236d9d688fb575e9e12232764ac617617c (patch)
tree1b174abac310f2a5ac63181b483c55fe93756133 /kernel/cpu.c
parent9c8f05c2837b06bb2739e85204c0d34009fb6494 (diff)
downloadlinux-2.6.34-ux500-87d5e0236d9d688fb575e9e12232764ac617617c.tar.gz
kernel/cpu.c: delete deprecated definition in cpu_up()
Additional_cpus is only supported for IA64 now. X86_64 should not be included. Signed-off-by: Chen Gong <gong.chen@linux.intel.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/cpu.c')
-rw-r--r--kernel/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 677f25376a3..f8cced2692b 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -338,7 +338,7 @@ int __cpuinit cpu_up(unsigned int cpu)
if (!cpu_possible(cpu)) {
printk(KERN_ERR "can't online cpu %d because it is not "
"configured as may-hotadd at boot time\n", cpu);
-#if defined(CONFIG_IA64) || defined(CONFIG_X86_64)
+#if defined(CONFIG_IA64)
printk(KERN_ERR "please check additional_cpus= boot "
"parameter\n");
#endif