From: Arve Hjønnevåg Date: Thu, 9 Feb 2012 22:24:38 +0000 (-0800) Subject: staging: android-alarm: Update hrtimer if alarm at the head of the queue is reprogrammed X-Git-Tag: MMI-PSA29.97-13-9~17268^2~176^2~9 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=66c48107719b751e8ec360034bc84ee1511147e4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: android-alarm: Update hrtimer if alarm at the head of the queue is reprogrammed If an alarm was restarted with a value that moved it away from the head of a queue, the hrtimer would not be updated. This would cause unnecessary wakeups. CC: Arve Hjønnevåg CC: Android Kernel Team Change-Id: If379f8dd92b0bdb3173bd8d057adfe0dc1d15259 Signed-off-by: Arve Hjønnevåg Signed-off-by: John Stultz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c index 5370fdc8b016..445c0b12c473 100644 --- a/drivers/staging/android/alarm.c +++ b/drivers/staging/android/alarm.c @@ -119,12 +119,15 @@ static void alarm_enqueue_locked(struct android_alarm *alarm) struct rb_node *parent = NULL; struct android_alarm *entry; int leftmost = 1; + bool was_first = false; pr_alarm(FLOW, "added alarm, type %d, func %pF at %lld\n", alarm->type, alarm->function, ktime_to_ns(alarm->expires)); - if (base->first == &alarm->node) + if (base->first == &alarm->node) { base->first = rb_next(&alarm->node); + was_first = true; + } if (!RB_EMPTY_NODE(&alarm->node)) { rb_erase(&alarm->node, &base->alarms); RB_CLEAR_NODE(&alarm->node); @@ -144,10 +147,10 @@ static void alarm_enqueue_locked(struct android_alarm *alarm) leftmost = 0; } } - if (leftmost) { + if (leftmost) base->first = &alarm->node; - update_timer_locked(base, false); - } + if (leftmost || was_first) + update_timer_locked(base, was_first); rb_link_node(&alarm->node, parent, link); rb_insert_color(&alarm->node, &base->alarms);