From: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> Rather than using tick_nohz_get_sleep_length(), let's convert to use the more flexible tick_nohz_get_next_timer|hrtimer() APIs. This should have no functional change, but allows following changes to later drop the tick_nohz_get_sleep_length() API. Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> [Ulf: Clarified information in changelog] Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx> --- Changes in v11: - New patch. --- drivers/cpuidle/governors/teo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/cpuidle/governors/teo.c b/drivers/cpuidle/governors/teo.c index 7d05efdbd3c6..bef1e95c597e 100644 --- a/drivers/cpuidle/governors/teo.c +++ b/drivers/cpuidle/governors/teo.c @@ -244,6 +244,9 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev, unsigned int duration_us, count; int max_early_idx, idx, i; ktime_t delta_tick; + ktime_t now = ktime_get(); + ktime_t next_hrtimer = tick_nohz_get_next_hrtimer(); + ktime_t next_timer = tick_nohz_get_next_timer(); if (cpu_data->last_state >= 0) { teo_update(drv, dev); @@ -252,7 +255,8 @@ static int teo_select(struct cpuidle_driver *drv, struct cpuidle_device *dev, cpu_data->time_span_ns = local_clock(); - cpu_data->sleep_length_ns = tick_nohz_get_sleep_length(&delta_tick); + cpu_data->sleep_length_ns = ktime_sub(next_timer, now); + delta_tick = ktime_sub(next_hrtimer, now); duration_us = ktime_to_us(cpu_data->sleep_length_ns); count = 0; -- 2.17.1