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/driver.c | |
| parent | Merge branch 'cpuidle/3.19' of http://git.linaro.org/git-ro/people/daniel.lez... (diff) | |
| parent | cpuidle: Invert CPUIDLE_FLAG_TIME_VALID logic (diff) | |
| download | linux-0a924200ae5fcf7b3d237d92a110545b6db6aa18.tar.xz linux-0a924200ae5fcf7b3d237d92a110545b6db6aa18.zip | |
Merge back earlier cpuidle material for 3.19-rc1.
Conflicts:
drivers/cpuidle/dt_idle_states.c
Diffstat (limited to 'drivers/cpuidle/driver.c')
| -rw-r--r-- | drivers/cpuidle/driver.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index e431d11abf8d..2697e87d5b34 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -201,7 +201,6 @@ static void poll_idle_init(struct cpuidle_driver *drv) state->exit_latency = 0; state->target_residency = 0; state->power_usage = -1; - state->flags = CPUIDLE_FLAG_TIME_VALID; state->enter = poll_idle; state->disabled = false; } |