2 files changed, 6 insertions, 12 deletions

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 110f4fbd319f..81a7a0a79be7 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -26,7 +26,6 @@
 #include <linux/of_fdt.h>
 #include <linux/interrupt.h>
 #include <linux/bug.h>
-#include <linux/cpuidle.h>
 #include <linux/pci.h>
 
 #include <asm/machdep.h>
@@ -225,16 +224,6 @@ static int __init pnv_probe(void)
         return 1;
 }
 
-void powernv_idle(void)
-{
-        /* Hook to cpuidle framework if available, else
-         * call on default platform idle code
-         */
-        if (cpuidle_idle_call()) {
-                power7_idle();
-        }
-}
-
 define_machine(powernv) {
         .name                   = "PowerNV",
         .probe                  = pnv_probe,
@@ -244,7 +233,7 @@ define_machine(powernv) {
         .show_cpuinfo           = pnv_show_cpuinfo,
         .progress               = pnv_progress,
         .machine_shutdown       = pnv_shutdown,
-        .power_save             = powernv_idle,
+        .power_save             = power7_idle,
         .calibrate_decr         = generic_calibrate_decr,
         .dma_set_mask           = pnv_dma_set_mask,
 #ifdef CONFIG_KEXEC
diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c
index 78fd174c57e8..f48607cd2540 100644
--- a/drivers/cpuidle/cpuidle-powernv.c
+++ b/drivers/cpuidle/cpuidle-powernv.c
@@ -14,6 +14,7 @@
 
 #include <asm/machdep.h>
 #include <asm/firmware.h>
+#include <asm/runlatch.h>
 
 struct cpuidle_driver powernv_idle_driver = {
         .name             = "powernv_idle",
@@ -30,12 +31,14 @@ static int snooze_loop(struct cpuidle_device *dev,
         local_irq_enable();
         set_thread_flag(TIF_POLLING_NRFLAG);
 
+        ppc64_runlatch_off();
         while (!need_resched()) {
                 HMT_low();
                 HMT_very_low();
         }
 
         HMT_medium();
+        ppc64_runlatch_on();
         clear_thread_flag(TIF_POLLING_NRFLAG);
         smp_mb();
         return index;
@@ -45,7 +48,9 @@ static int nap_loop(struct cpuidle_device *dev,
                         struct cpuidle_driver *drv,
                         int index)
 {
+        ppc64_runlatch_off();
         power7_idle();
+        ppc64_runlatch_on();
         return index;
 }