diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-21 16:31:42 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-21 16:31:42 +0100 |
| commit | 0a924200ae5fcf7b3d237d92a110545b6db6aa18 (patch) | |
| tree | 2b6543b97264c11f0e948b568ec397c50d54eb76 /drivers/cpuidle/dt_idle_states.c | |
| parent | a74a5a3381c0f600d390e3997976c4ddf31417ab (diff) | |
| parent | b82b6cca488074da3852e8a54fde1d9f74bf1557 (diff) | |
| download | linux-stable-0a924200ae5fcf7b3d237d92a110545b6db6aa18.tar.gz linux-stable-0a924200ae5fcf7b3d237d92a110545b6db6aa18.tar.bz2 linux-stable-0a924200ae5fcf7b3d237d92a110545b6db6aa18.zip | |
Merge back earlier cpuidle material for 3.19-rc1.
Conflicts:
drivers/cpuidle/dt_idle_states.c
Diffstat (limited to 'drivers/cpuidle/dt_idle_states.c')
| -rw-r--r-- | drivers/cpuidle/dt_idle_states.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/dt_idle_states.c b/drivers/cpuidle/dt_idle_states.c index 5301912cb84e..a5c111b67f37 100644 --- a/drivers/cpuidle/dt_idle_states.c +++ b/drivers/cpuidle/dt_idle_states.c @@ -78,7 +78,7 @@ static int init_state_node(struct cpuidle_state *idle_state, if (err) desc = state_node->name; - idle_state->flags = CPUIDLE_FLAG_TIME_VALID; + idle_state->flags = 0; if (of_property_read_bool(state_node, "local-timer-stop")) idle_state->flags |= CPUIDLE_FLAG_TIMER_STOP; /* |