aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/cpuidle/governors/menu.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index c36e1ea7ef08..ba6df6044fff 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -296,7 +296,6 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
296 int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY); 296 int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
297 int i; 297 int i;
298 unsigned int interactivity_req; 298 unsigned int interactivity_req;
299 struct timespec t;
300 299
301 if (data->needs_update) { 300 if (data->needs_update) {
302 menu_update(drv, dev); 301 menu_update(drv, dev);
@@ -310,9 +309,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
310 return 0; 309 return 0;
311 310
312 /* determine the expected residency time, round up */ 311 /* determine the expected residency time, round up */
313 t = ktime_to_timespec(tick_nohz_get_sleep_length()); 312 data->next_timer_us = ktime_to_us(tick_nohz_get_sleep_length());
314 data->next_timer_us =
315 t.tv_sec * USEC_PER_SEC + t.tv_nsec / NSEC_PER_USEC;
316 313
317 314
318 data->bucket = which_bucket(data->next_timer_us); 315 data->bucket = which_bucket(data->next_timer_us);