diff --git a/[refs] b/[refs]
index 77bd16809ce5..3a79b790d652 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2513926c286ca1d0d189c206966011bdd4080354
+refs/heads/master: 3d3f487c58ef1ece714af280b29411960908149c
diff --git a/trunk/include/asm-x86/processor.h b/trunk/include/asm-x86/processor.h
index 9054734589fe..8bec23c15527 100644
--- a/trunk/include/asm-x86/processor.h
+++ b/trunk/include/asm-x86/processor.h
@@ -144,6 +144,15 @@ DECLARE_PER_CPU(struct cpuinfo_x86, cpu_info);
 #define current_cpu_data	boot_cpu_data
 #endif
 
+static inline int hlt_works(int cpu)
+{
+#ifdef CONFIG_X86_32
+	return cpu_data(cpu).hlt_works_ok;
+#else
+	return 1;
+#endif
+}
+
 #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
 
 extern void cpu_detect(struct cpuinfo_x86 *c);