1 files changed, 6 insertions, 9 deletions

diff --git a/arch/ppc64/kernel/idle.c b/arch/ppc64/kernel/idle.c
index 8fec27469802..715bc0e71e0f 100644
--- a/arch/ppc64/kernel/idle.c
+++ b/arch/ppc64/kernel/idle.c
@@ -34,15 +34,11 @@ extern void power4_idle(void);
 
 void default_idle(void)
 {
-        long oldval;
         unsigned int cpu = smp_processor_id();
+        set_thread_flag(TIF_POLLING_NRFLAG);
 
         while (1) {
-                oldval = test_and_clear_thread_flag(TIF_NEED_RESCHED);
-
-                if (!oldval) {
-                        set_thread_flag(TIF_POLLING_NRFLAG);
-
+                if (!need_resched()) {
                         while (!need_resched() && !cpu_is_offline(cpu)) {
                                 ppc64_runlatch_off();
 
@@ -55,13 +51,12 @@ void default_idle(void)
                         }
 
                         HMT_medium();
-                        clear_thread_flag(TIF_POLLING_NRFLAG);
-                } else {
-                        set_need_resched();
                 }
 
                 ppc64_runlatch_on();
+                preempt_enable_no_resched();
                 schedule();
+                preempt_disable();
                 if (cpu_is_offline(cpu) && system_state == SYSTEM_RUNNING)
                         cpu_die();
         }
@@ -77,7 +72,9 @@ void native_idle(void)
 
                 if (need_resched()) {
                         ppc64_runlatch_on();
+                        preempt_enable_no_resched();
                         schedule();
+                        preempt_disable();
                 }
 
                 if (cpu_is_offline(smp_processor_id()) &&