---

yaml --- r: 186234 b: refs/heads/master c: 87d5e02 h: refs/heads/master v: v3
git-mirror · Mar 6, 2010 · ff494ff · ff494ff
1 parent cfa0be9
commit ff494ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c8f05c2837b06bb2739e85204c0d34009fb6494
+refs/heads/master: 87d5e0236d9d688fb575e9e12232764ac617617c
diff --git a/trunk/kernel/cpu.c b/trunk/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