diff --git a/[refs] b/[refs]
index 7859df1c76ba..ed4abb3b1113 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b4fd4bb2e7fad2c41afab4683a44ab77f6f35d0
+refs/heads/master: 6f585e01614f38195599c1bc5379d3c9dae6be47
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index e1200b202ed7..f35c2d8016ac 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -939,9 +939,9 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
 				inquire_remote_apic(apicid);
 		}
 	}
-
+#ifdef CONFIG_X86_64
 restore_state:
-
+#endif
 	if (boot_error) {
 		/* Try to put things back the way they were before ... */
 		numa_remove_cpu(cpu); /* was set by numa_add_cpu */