1 files changed, 12 insertions, 5 deletions

diff --git a/arch/ppc/kernel/idle.c b/arch/ppc/kernel/idle.c
index 11e5b44713f7..a6141f05c919 100644
--- a/arch/ppc/kernel/idle.c
+++ b/arch/ppc/kernel/idle.c
@@ -53,10 +53,6 @@ void default_idle(void)
                 }
 #endif
         }
-        if (need_resched())
-                schedule();
-        if (cpu_is_offline(cpu) && system_state == SYSTEM_RUNNING)
-                cpu_die();
 }
 
 /*
@@ -64,11 +60,22 @@ void default_idle(void)
  */
 void cpu_idle(void)
 {
-        for (;;)
+        int cpu = smp_processor_id();
+
+        for (;;) {
                 if (ppc_md.idle != NULL)
                         ppc_md.idle();
                 else
                         default_idle();
+                if (cpu_is_offline(cpu) && system_state == SYSTEM_RUNNING)
+                        cpu_die();
+                if (need_resched()) {
+                        preempt_enable_no_resched();
+                        schedule();
+                        preempt_disable();
+                }
+
+        }
 }
 
 #if defined(CONFIG_SYSCTL) && defined(CONFIG_6xx)