aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-04-07 13:11:55 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-04-09 05:54:57 -0400
commit7d2f6abb402ae38ec4bb7beabb3980bb834b1e0d (patch)
tree14e65a4146f15cbea4369ef682058d21388f06a5
parentff7de6203131e3d60cda60aeda12c69373ca5d43 (diff)
time: hrtimer: Use timerqueue_iterate_next() to get to the next timer
Use timerqueue_iterate_next() to get to the next timer in __hrtimer_next_event_base() without browsing the timerqueue details diredctly. No intentional changes in functionality. Suggested-by: Frederic Weisbecker <frederic@kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--kernel/time/hrtimer.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 6d387dbd7304..14e858753d76 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -505,9 +505,7 @@ static ktime_t __hrtimer_next_event_base(struct hrtimer_cpu_base *cpu_base,
505 timer = container_of(next, struct hrtimer, node); 505 timer = container_of(next, struct hrtimer, node);
506 if (timer == exclude) { 506 if (timer == exclude) {
507 /* Get to the next timer in the queue. */ 507 /* Get to the next timer in the queue. */
508 struct rb_node *rbn = rb_next(&next->node); 508 next = timerqueue_iterate_next(next);
509
510 next = rb_entry_safe(rbn, struct timerqueue_node, node);
511 if (!next) 509 if (!next)
512 continue; 510 continue;
513 511