summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-05-30 23:15:57 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-06-04 15:40:31 +0200
commite344c9e76bc6af997926171bfd90d25bbae0a2c5 (patch)
treee4919f974d286ae86985109dc0fa894021b54e9c
parentalarmtimer: Implement remaining callback (diff)
downloadlinux-e344c9e76bc6af997926171bfd90d25bbae0a2c5.tar.xz
linux-e344c9e76bc6af997926171bfd90d25bbae0a2c5.zip
alarmtimer: Implement try_to_cancel callback
Preparatory change to utilize the common posix timer mechanisms. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: John Stultz <john.stultz@linaro.org> Link: http://lkml.kernel.org/r/20170530211657.670026824@linutronix.de
Diffstat (limited to '')
-rw-r--r--kernel/time/alarmtimer.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 02ddc40f19fe..374bd855a488 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -573,6 +573,15 @@ static ktime_t alarm_timer_remaining(struct k_itimer *timr, ktime_t now)
}
/**
+ * alarm_timer_try_to_cancel - Posix timer callback to cancel a timer
+ * @timr: Pointer to the posixtimer data struct
+ */
+static int alarm_timer_try_to_cancel(struct k_itimer *timr)
+{
+ return alarm_try_to_cancel(&timr->it.alarm.alarmtimer);
+}
+
+/**
* alarm_clock_getres - posix getres interface
* @which_clock: clockid
* @tp: timespec to fill
@@ -902,6 +911,7 @@ const struct k_clock alarm_clock = {
.timer_rearm = alarm_timer_rearm,
.timer_forward = alarm_timer_forward,
.timer_remaining = alarm_timer_remaining,
+ .timer_try_to_cancel = alarm_timer_try_to_cancel,
.nsleep = alarm_timer_nsleep,
};
#endif /* CONFIG_POSIX_TIMERS */