powerpc: Rework lazy-interrupt handling

[deliverable/linux.git] / arch / powerpc / kernel / idle.c

diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c
index 0a48bf5db6c84bfbf0152a9b3c52e83b9f43646d..8f7a2b62863d2522e4b915b4dae005e44aeb2279 100644 (file)
--- 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 {