Merge tag 'powerpc-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[cascardo/linux.git] / drivers / cpuidle / cpuidle-powernv.c

diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c
index a489b56..aedec09 100644 (file)
--- a/drivers/cpuidle/cpuidle-powernv.c
+++ b/drivers/cpuidle/cpuidle-powernv.c
@@ -90,7 +90,6 @@ static struct cpuidle_state powernv_states[MAX_POWERNV_IDLE_STATES] = {
        { /* Snooze */
                .name = "snooze",
                .desc = "snooze",
-               .flags = CPUIDLE_FLAG_TIME_VALID,
                .exit_latency = 0,
                .target_residency = 0,
                .enter = &snooze_loop },
@@ -199,7 +198,7 @@ static int powernv_add_idle_states(void)
                        /* Add NAP state */
                        strcpy(powernv_states[nr_idle_states].name, "Nap");
                        strcpy(powernv_states[nr_idle_states].desc, "Nap");
-                       powernv_states[nr_idle_states].flags = CPUIDLE_FLAG_TIME_VALID;
+                       powernv_states[nr_idle_states].flags = 0;
                        powernv_states[nr_idle_states].exit_latency =
                                        ((unsigned int)latency_ns) / 1000;
                        powernv_states[nr_idle_states].target_residency =
@@ -213,8 +212,7 @@ static int powernv_add_idle_states(void)
                        /* Add FASTSLEEP state */
                        strcpy(powernv_states[nr_idle_states].name, "FastSleep");
                        strcpy(powernv_states[nr_idle_states].desc, "FastSleep");
-                       powernv_states[nr_idle_states].flags =
-                               CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TIMER_STOP;
+                       powernv_states[nr_idle_states].flags = CPUIDLE_FLAG_TIMER_STOP;
                        powernv_states[nr_idle_states].exit_latency =
                                        ((unsigned int)latency_ns) / 1000;
                        powernv_states[nr_idle_states].target_residency =