summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-08-10 11:08:07 -0700
committerJohn Stultz <john.stultz@linaro.org>2011-08-10 14:55:22 -0700
commit54da23b720d5d612f8f1669f9ed3744008fb7382 (patch)
tree52bfd90a34c4ad9de858ecb30d212104d0176845 /kernel/time
parent4b41308d2d0398409620613c7eaaaf52c738b042 (diff)
downloadlinux-54da23b720d5d612f8f1669f9ed3744008fb7382.tar.bz2
alarmtimers: Push rearming peroidic timers down into alamrtimer handler
This patch pushes the periodic alarmtimer re-arming down into the alarmtimer handler, mimicking how hrtimers handle this. CC: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/alarmtimer.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 9e786053ffa2..55e634ea6054 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -174,6 +174,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
unsigned long flags;
ktime_t now;
int ret = HRTIMER_NORESTART;
+ int restart = ALARMTIMER_NORESTART;
spin_lock_irqsave(&base->lock, flags);
now = base->gettime();
@@ -188,16 +189,16 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
timerqueue_del(&base->timerqueue, &alarm->node);
alarm->enabled = 0;
- /* Re-add periodic timers */
- if (alarm->period.tv64) {
- alarm->node.expires = ktime_add(expired, alarm->period);
- timerqueue_add(&base->timerqueue, &alarm->node);
- alarm->enabled = 1;
- }
+
spin_unlock_irqrestore(&base->lock, flags);
if (alarm->function)
- alarm->function(alarm, now);
+ restart = alarm->function(alarm, now);
spin_lock_irqsave(&base->lock, flags);
+
+ if (restart != ALARMTIMER_NORESTART) {
+ timerqueue_add(&base->timerqueue, &alarm->node);
+ alarm->enabled = 1;
+ }
}
if (next) {
@@ -373,6 +374,11 @@ static enum alarmtimer_restart alarm_handle_timer(struct alarm *alarm,
if (posix_timer_event(ptr, 0) != 0)
ptr->it_overrun++;
+ /* Re-add periodic timers */
+ if (alarm->period.tv64) {
+ alarm->node.expires = ktime_add(now, alarm->period);
+ return ALARMTIMER_RESTART;
+ }
return ALARMTIMER_NORESTART;
}