diff --git a/[refs] b/[refs]
index 4d683feb3659..e3375d71ef91 100644
--- 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
index 677f25376a38..f8cced2692b3 100644
--- 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