Merge tag 'v3.16-rc1' into i2c/for-next

[karo-tx-linux.git] / drivers / cpuidle / cpuidle-powernv.c

diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c
index 719f6fb5b1c35d00108c47a61918741200eae75d..74f5788d50b12986c68fdfdda10d92218314c45e 100644 (file)
--- a/drivers/cpuidle/cpuidle-powernv.c
+++ b/drivers/cpuidle/cpuidle-powernv.c
@@ -73,12 +73,10 @@ static int fastsleep_loop(struct cpuidle_device *dev,
                return index;
 
        new_lpcr = old_lpcr;
-       new_lpcr &= ~(LPCR_MER | LPCR_PECE); /* lpcr[mer] must be 0 */
-
-       /* exit powersave upon external interrupt, but not decrementer
-        * interrupt.
+       /* Do not exit powersave upon decrementer as we've setup the timer
+        * offload.
         */
-       new_lpcr |= LPCR_PECE0;
+       new_lpcr &= ~LPCR_PECE1;
 
        mtspr(SPRN_LPCR, new_lpcr);
        power7_sleep();