Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
[~shefty/rdma-dev.git] / arch / x86 / kernel / smpboot.c
index ce13315d48fb73d9d55f8344e99e6c50bbe168db..6e1e406038c23d963ee12fcab76abca544cc1d86 100644 (file)
@@ -50,6 +50,7 @@
 #include <linux/tboot.h>
 #include <linux/stackprotector.h>
 #include <linux/gfp.h>
+#include <linux/cpuidle.h>
 
 #include <asm/acpi.h>
 #include <asm/desc.h>
@@ -1404,7 +1405,8 @@ void native_play_dead(void)
        tboot_shutdown(TB_SHUTDOWN_WFS);
 
        mwait_play_dead();      /* Only returns on failure */
-       hlt_play_dead();
+       if (cpuidle_play_dead())
+               hlt_play_dead();
 }
 
 #else /* ... !CONFIG_HOTPLUG_CPU */