From 19b76f01dd25f2bdc692b4af250a98fd26c71ae9 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 1 Feb 2011 13:52:09 +0000 Subject: [PATCH] --- yaml --- r: 234608 b: refs/heads/master c: 0aa3975f02ce78f27be3076fbfa3d94ae5a659d5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/posix-timers.c | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/[refs] b/[refs] index 696c1581d508..bd4ed06dd227 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6761c6702e2c647582e1829abe8cf90794f61d9d +refs/heads/master: 0aa3975f02ce78f27be3076fbfa3d94ae5a659d5 diff --git a/trunk/kernel/posix-timers.c b/trunk/kernel/posix-timers.c index ade7dec49f96..ad154dfd7c51 100644 --- a/trunk/kernel/posix-timers.c +++ b/trunk/kernel/posix-timers.c @@ -167,28 +167,6 @@ static inline void unlock_timer(struct k_itimer *timr, unsigned long flags) spin_unlock_irqrestore(&timr->it_lock, flags); } -/* - * Call the k_clock hook function if non-null, or the default function. - */ -#define CLOCK_DISPATCH(clock, call, arglist) \ - ((clock) < 0 ? posix_cpu_##call arglist : \ - (posix_clocks[clock].call != NULL \ - ? (*posix_clocks[clock].call) arglist : common_##call arglist)) - -/* - * Return nonzero if we know a priori this clockid_t value is bogus. - */ -static inline int invalid_clockid(const clockid_t which_clock) -{ - if (which_clock < 0) /* CPU clock, posix_cpu_* will check it */ - return 0; - if ((unsigned) which_clock >= MAX_CLOCKS) - return 1; - if (posix_clocks[which_clock].clock_getres != NULL) - return 0; - return 1; -} - /* Get clock_realtime */ static int posix_clock_realtime_get(clockid_t which_clock, struct timespec *tp) {