diff options
| author | Todd Poynor <toddpoynor@google.com> | 2013-05-08 15:49:18 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2013-07-01 14:16:28 -0700 |
| commit | 0ccfc3ce82fbc2b2df5ab11ebfa43f894a6a4ae7 (patch) | |
| tree | 5dad7a03303219500a2c5d42a177fb30ce6986ab | |
| parent | 3ab74abdc30faaaa49eae6ae233769b092ec3378 (diff) | |
| download | olio-linux-3.10-0ccfc3ce82fbc2b2df5ab11ebfa43f894a6a4ae7.tar.xz olio-linux-3.10-0ccfc3ce82fbc2b2df5ab11ebfa43f894a6a4ae7.zip | |
alarmtimer: add alarm_restart
Analogous to hrtimer_restart, restart an alarmtimer after the expires
time has already been updated (as with alarm_forward).
Change-Id: Ia2613bbb467404cb2c35c11efa772bc56294963a
Signed-off-by: Todd Poynor <toddpoynor@google.com>
| -rw-r--r-- | include/linux/alarmtimer.h | 1 | ||||
| -rw-r--r-- | kernel/time/alarmtimer.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/alarmtimer.h b/include/linux/alarmtimer.h index 9069694e70e..65e04ceec27 100644 --- a/include/linux/alarmtimer.h +++ b/include/linux/alarmtimer.h @@ -44,6 +44,7 @@ struct alarm { void alarm_init(struct alarm *alarm, enum alarmtimer_type type, enum alarmtimer_restart (*function)(struct alarm *, ktime_t)); int alarm_start(struct alarm *alarm, ktime_t start); +void alarm_restart(struct alarm *alarm); int alarm_try_to_cancel(struct alarm *alarm); int alarm_cancel(struct alarm *alarm); diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index f11d83b1294..059e78b1267 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -324,6 +324,18 @@ int alarm_start(struct alarm *alarm, ktime_t start) return ret; } +void alarm_restart(struct alarm *alarm) +{ + struct alarm_base *base = &alarm_bases[alarm->type]; + unsigned long flags; + + spin_lock_irqsave(&base->lock, flags); + hrtimer_set_expires(&alarm->timer, alarm->node.expires); + hrtimer_restart(&alarm->timer); + alarmtimer_enqueue(base, alarm); + spin_unlock_irqrestore(&base->lock, flags); +} + /** * alarm_try_to_cancel - Tries to cancel an alarm timer * @alarm: ptr to alarm to be canceled |