diff options
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 7a7690ab6cb8..db37f49da5ac 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <linux/module.h> | 43 | #include <linux/module.h> |
| 44 | #include <linux/io.h> | 44 | #include <linux/io.h> |
| 45 | #include <linux/atomic.h> | 45 | #include <linux/atomic.h> |
| 46 | #include <linux/cpu.h> | ||
| 46 | 47 | ||
| 47 | #include <asm/fncpy.h> | 48 | #include <asm/fncpy.h> |
| 48 | #include <asm/system_misc.h> | 49 | #include <asm/system_misc.h> |
| @@ -584,8 +585,7 @@ static void omap_pm_init_proc(void) | |||
| 584 | static int omap_pm_prepare(void) | 585 | static int omap_pm_prepare(void) |
| 585 | { | 586 | { |
| 586 | /* We cannot sleep in idle until we have resumed */ | 587 | /* We cannot sleep in idle until we have resumed */ |
| 587 | disable_hlt(); | 588 | cpu_idle_poll_ctrl(true); |
| 588 | |||
| 589 | return 0; | 589 | return 0; |
| 590 | } | 590 | } |
| 591 | 591 | ||
| @@ -621,7 +621,7 @@ static int omap_pm_enter(suspend_state_t state) | |||
| 621 | 621 | ||
| 622 | static void omap_pm_finish(void) | 622 | static void omap_pm_finish(void) |
| 623 | { | 623 | { |
| 624 | enable_hlt(); | 624 | cpu_idle_poll_ctrl(false); |
| 625 | } | 625 | } |
| 626 | 626 | ||
| 627 | 627 | ||