Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / arch / arm / mach-omap1 / pm.c

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index ff72d297a172550a83faaba10502ff49f495f3c6..dd712f10973888b0952b80bd15c4f903b48b748b 100644 (file)
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -44,6 +44,7 @@
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/atomic.h>
+#include <linux/cpu.h>
 
 #include <asm/fncpy.h>
 #include <asm/system_misc.h>
@@ -580,8 +581,7 @@ static void omap_pm_init_debugfs(void)
 static int omap_pm_prepare(void)
 {
        /* We cannot sleep in idle until we have resumed */
-       disable_hlt();
-
+       cpu_idle_poll_ctrl(true);
        return 0;
 }
 
@@ -617,7 +617,7 @@ static int omap_pm_enter(suspend_state_t state)
 
 static void omap_pm_finish(void)
 {
-       enable_hlt();
+       cpu_idle_poll_ctrl(false);
 }