DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtc: alarm: Update hrtimer if alarm at the head of the queue is reprogrammed

Browse Source 
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.

Change-Id: If379f8dd92b0bdb3173bd8d057adfe0dc1d15259
Signed-off-by: Arve Hjønnevåg <arve@android.com>
This commit is contained in:
Arve Hjønnevåg
2011-01-07 19:00:01 -08:00
committed by Colin Cross
parent 677ef29f71
commit 2cd24680f6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/rtc/alarm.c
View File

@@ -109,12 +109,15 @@ static void alarm_enqueue_locked(struct alarm *alarm)
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
struct alarm *entry; struct alarm *entry;
int leftmost = 1; int leftmost = 1;
bool was_first = false;
pr_alarm(FLOW, "added alarm, type %d, func %pF at %lld\n", pr_alarm(FLOW, "added alarm, type %d, func %pF at %lld\n",
alarm->type, alarm->function, ktime_to_ns(alarm->expires)); 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); base->first = rb_next(&alarm->node);
was_first = true;
}
if (!RB_EMPTY_NODE(&alarm->node)) { if (!RB_EMPTY_NODE(&alarm->node)) {
rb_erase(&alarm->node, &base->alarms); rb_erase(&alarm->node, &base->alarms);
RB_CLEAR_NODE(&alarm->node); RB_CLEAR_NODE(&alarm->node);
@@ -134,10 +137,10 @@ static void alarm_enqueue_locked(struct alarm *alarm)
leftmost = 0; leftmost = 0;
} }
} }
if (leftmost) { if (leftmost)
base->first = &alarm->node; 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_link_node(&alarm->node, parent, link);
rb_insert_color(&alarm->node, &base->alarms); rb_insert_color(&alarm->node, &base->alarms);