summaryrefslogtreecommitdiff
path: root/kernel/posix-timers.c
diff options
context:
space:
mode:
authorRichard Cochran <richard.cochran@omicron.at>2011-02-01 13:52:32 +0000
committerThomas Gleixner <tglx@linutronix.de>2011-02-02 15:28:19 +0100
commit81e294cba2596f5f10848bbe19d98b344c2a2d5c (patch)
tree4334ced22eff475275a81f7e62f1f5e9df43a433 /kernel/posix-timers.c
parentce26efdefa5e8f22d933df72d7f7482725091d6d (diff)
downloadlinux-81e294cba2596f5f10848bbe19d98b344c2a2d5c.tar.gz
posix-timers: Add support for fd based clocks
Extend the negative clockids which are currently used by posix cpu timers to encode the PID with a file descriptor based type which encodes the fd in the upper bits. Originally-from: Richard Cochran <richard.cochran@omicron.at> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: John Stultz <johnstul@us.ibm.com> LKML-Reference: <20110201134420.062860200@linutronix.de>
Diffstat (limited to 'kernel/posix-timers.c')
-rw-r--r--kernel/posix-timers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 5a5a4f1c0971..df629d853a81 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -488,7 +488,7 @@ static void release_posix_timer(struct k_itimer *tmr, int it_id_set)
static struct k_clock *clockid_to_kclock(const clockid_t id)
{
if (id < 0)
- return &clock_posix_cpu;
+ return (id & CLOCKFD_MASK) == CLOCKFD ? NULL : &clock_posix_cpu;
if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
return NULL;