Merge branch 'upstream' into irq-pio

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c
index e9f321d74d85..d491052c8e0c 100644
--- a/arch/powerpc/kernel/idle.c
+++ b/arch/powerpc/kernel/idle.c
@@ -50,9 +50,9 @@ void cpu_idle(void)
 
         set_thread_flag(TIF_POLLING_NRFLAG);
         while (1) {
-                ppc64_runlatch_off();
-
                 while (!need_resched() && !cpu_should_die()) {
+                        ppc64_runlatch_off();
+
                         if (ppc_md.power_save) {
                                 clear_thread_flag(TIF_POLLING_NRFLAG);
                                 /*