From 918c432b2f8ec4ca598e35ef19a9133fd8bbd205 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 1 Feb 2011 13:52:07 +0000 Subject: [PATCH] --- yaml --- r: 234607 b: refs/heads/master c: 6761c6702e2c647582e1829abe8cf90794f61d9d h: refs/heads/master i: 234605: d6baa60b7d9216f89751d910e99e5d1cf20fef54 234603: a5c8bf864182f3031593b5956bb065b67f5a7711 234599: ab31f34f17fe81d23cc0314f68118825b3405b8c 234591: 524915e9603969feb19dac669f3842597cb0ef10 v: v3 --- [refs] | 2 +- trunk/kernel/posix-timers.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ad2cc9607c2a..696c1581d508 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7319fa253a549c4c6528fb550ae6e72a9c83811 +refs/heads/master: 6761c6702e2c647582e1829abe8cf90794f61d9d diff --git a/trunk/kernel/posix-timers.c b/trunk/kernel/posix-timers.c index c1e2636f9e45..ade7dec49f96 100644 --- a/trunk/kernel/posix-timers.c +++ b/trunk/kernel/posix-timers.c @@ -254,6 +254,7 @@ static __init int init_posix_timers(void) .timer_create = common_timer_create, .timer_set = common_timer_set, .timer_get = common_timer_get, + .timer_del = common_timer_del, }; struct k_clock clock_monotonic = { .clock_getres = hrtimer_get_res, @@ -263,6 +264,7 @@ static __init int init_posix_timers(void) .timer_create = common_timer_create, .timer_set = common_timer_set, .timer_get = common_timer_get, + .timer_del = common_timer_del, }; struct k_clock clock_monotonic_raw = { .clock_getres = hrtimer_get_res, @@ -859,7 +861,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags, return error; } -static inline int common_timer_del(struct k_itimer *timer) +static int common_timer_del(struct k_itimer *timer) { timer->it.real.interval.tv64 = 0; @@ -870,7 +872,11 @@ static inline int common_timer_del(struct k_itimer *timer) static inline int timer_delete_hook(struct k_itimer *timer) { - return CLOCK_DISPATCH(timer->it_clock, timer_del, (timer)); + struct k_clock *kc = clockid_to_kclock(timer->it_clock); + + if (WARN_ON_ONCE(!kc || !kc->timer_del)) + return -EINVAL; + return kc->timer_del(timer); } /* Delete a POSIX.1b interval timer. */