diff options
| -rw-r--r-- | drivers/cpuidle/governors/ladder.c | 7 | 
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c index 37263d9a1051..401c0106ed34 100644 --- a/drivers/cpuidle/governors/ladder.c +++ b/drivers/cpuidle/governors/ladder.c @@ -79,12 +79,7 @@ static int ladder_select_state(struct cpuidle_driver *drv,  	last_state = &ldev->states[last_idx]; -	if (!(drv->states[last_idx].flags & CPUIDLE_FLAG_TIME_INVALID)) { -		last_residency = cpuidle_get_last_residency(dev) - \ -					 drv->states[last_idx].exit_latency; -	} -	else -		last_residency = last_state->threshold.promotion_time + 1; +	last_residency = cpuidle_get_last_residency(dev) - drv->states[last_idx].exit_latency;  	/* consider promotion */  	if (last_idx < drv->state_count - 1 &&  | 
