aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/alarmtimer.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index ea5e1a928d5b..9e786053ffa2 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -196,7 +196,7 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
196 } 196 }
197 spin_unlock_irqrestore(&base->lock, flags); 197 spin_unlock_irqrestore(&base->lock, flags);
198 if (alarm->function) 198 if (alarm->function)
199 alarm->function(alarm); 199 alarm->function(alarm, now);
200 spin_lock_irqsave(&base->lock, flags); 200 spin_lock_irqsave(&base->lock, flags);
201 } 201 }
202 202
@@ -299,7 +299,7 @@ static void alarmtimer_freezerset(ktime_t absexp, enum alarmtimer_type type)
299 * @function: callback that is run when the alarm fires 299 * @function: callback that is run when the alarm fires
300 */ 300 */
301void alarm_init(struct alarm *alarm, enum alarmtimer_type type, 301void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
302 void (*function)(struct alarm *)) 302 enum alarmtimer_restart (*function)(struct alarm *, ktime_t))
303{ 303{
304 timerqueue_init(&alarm->node); 304 timerqueue_init(&alarm->node);
305 alarm->period = ktime_set(0, 0); 305 alarm->period = ktime_set(0, 0);
@@ -365,12 +365,15 @@ static enum alarmtimer_type clock2alarm(clockid_t clockid)
365 * 365 *
366 * Posix timer callback for expired alarm timers. 366 * Posix timer callback for expired alarm timers.
367 */ 367 */
368static void alarm_handle_timer(struct alarm *alarm) 368static enum alarmtimer_restart alarm_handle_timer(struct alarm *alarm,
369 ktime_t now)
369{ 370{
370 struct k_itimer *ptr = container_of(alarm, struct k_itimer, 371 struct k_itimer *ptr = container_of(alarm, struct k_itimer,
371 it.alarmtimer); 372 it.alarmtimer);
372 if (posix_timer_event(ptr, 0) != 0) 373 if (posix_timer_event(ptr, 0) != 0)
373 ptr->it_overrun++; 374 ptr->it_overrun++;
375
376 return ALARMTIMER_NORESTART;
374} 377}
375 378
376/** 379/**
@@ -509,13 +512,15 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,
509 * 512 *
510 * Wakes up the task that set the alarmtimer 513 * Wakes up the task that set the alarmtimer
511 */ 514 */
512static void alarmtimer_nsleep_wakeup(struct alarm *alarm) 515static enum alarmtimer_restart alarmtimer_nsleep_wakeup(struct alarm *alarm,
516 ktime_t now)
513{ 517{
514 struct task_struct *task = (struct task_struct *)alarm->data; 518 struct task_struct *task = (struct task_struct *)alarm->data;
515 519
516 alarm->data = NULL; 520 alarm->data = NULL;
517 if (task) 521 if (task)
518 wake_up_process(task); 522 wake_up_process(task);
523 return ALARMTIMER_NORESTART;
519} 524}
520 525
521/** 526/**