Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

posix-timers: Convert timer_delete() to clockid_to_kclock()

Browse source 
Set the common function for CLOCK_MONOTONIC and CLOCK_REALTIME kclocks
and use the new decoding function.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: John Stultz <johnstul@us.ibm.com>
Tested-by: Richard Cochran <richard.cochran@omicron.at>
LKML-Reference: <20110201134419.198999420@linutronix.de>
This commit is contained in:
Thomas Gleixner 2011-02-01 13:52:07 +00:00
parent a7319fa253
commit 6761c6702e
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kernel/posix-timers.c
View file

@ -254,6 +254,7 @@ static __init int init_posix_timers(void)
.timer_create = common_timer_create, .timer_create = common_timer_create,
.timer_set = common_timer_set, .timer_set = common_timer_set,
.timer_get = common_timer_get, .timer_get = common_timer_get,
.timer_del = common_timer_del,
}; };
struct k_clock clock_monotonic = { struct k_clock clock_monotonic = {
.clock_getres = hrtimer_get_res, .clock_getres = hrtimer_get_res,
@ -263,6 +264,7 @@ static __init int init_posix_timers(void)
.timer_create = common_timer_create, .timer_create = common_timer_create,
.timer_set = common_timer_set, .timer_set = common_timer_set,
.timer_get = common_timer_get, .timer_get = common_timer_get,
.timer_del = common_timer_del,
}; };
struct k_clock clock_monotonic_raw = { struct k_clock clock_monotonic_raw = {
.clock_getres = hrtimer_get_res, .clock_getres = hrtimer_get_res,
@ -859,7 +861,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
return error; 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; 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) 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. */ /* Delete a POSIX.1b interval timer. */