1 files changed, 5 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c
index 0a48bf5db6c8..8f7a2b62863d 100644
--- a/arch/powerpc/kernel/idle.c
+++ b/arch/powerpc/kernel/idle.c
@@ -84,7 +84,11 @@ void cpu_idle(void)
 
                                 start_critical_timings();
 
-                                local_irq_enable();
+                                /* Some power_save functions return with
+                                 * interrupts enabled, some don't.
+                                 */
+                                if (irqs_disabled())
+                                        local_irq_enable();
                                 set_thread_flag(TIF_POLLING_NRFLAG);
 
                         } else {