From 86762077c51b9b1089509f6d80357283340eff60 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 1 Feb 2006 03:05:14 -0800 Subject: [PATCH] --- yaml --- r: 19352 b: refs/heads/master c: 493f01d1d0699ddafc30067d33fcc18d0b95b624 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/posix-timers.h | 1 - trunk/kernel/posix-timers.c | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 478d2df27592..5c70582b3d6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 952bbc87f01f552ef091a62ea2a721b5b2670e74 +refs/heads/master: 493f01d1d0699ddafc30067d33fcc18d0b95b624 diff --git a/trunk/include/linux/posix-timers.h b/trunk/include/linux/posix-timers.h index 54faf5236da0..95572c434bc9 100644 --- a/trunk/include/linux/posix-timers.h +++ b/trunk/include/linux/posix-timers.h @@ -84,7 +84,6 @@ struct k_clock { void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock); /* error handlers for timer_create, nanosleep and settime */ -int do_posix_clock_notimer_create(struct k_itimer *timer); int do_posix_clock_nonanosleep(const clockid_t, int flags, struct timespec *, struct timespec __user *); int do_posix_clock_nosettime(const clockid_t, struct timespec *tp); diff --git a/trunk/kernel/posix-timers.c b/trunk/kernel/posix-timers.c index aad6f138d5c9..216f574b5ffb 100644 --- a/trunk/kernel/posix-timers.c +++ b/trunk/kernel/posix-timers.c @@ -875,12 +875,6 @@ int do_posix_clock_nosettime(const clockid_t clockid, struct timespec *tp) } EXPORT_SYMBOL_GPL(do_posix_clock_nosettime); -int do_posix_clock_notimer_create(struct k_itimer *timer) -{ - return -EINVAL; -} -EXPORT_SYMBOL_GPL(do_posix_clock_notimer_create); - int do_posix_clock_nonanosleep(const clockid_t clock, int flags, struct timespec *t, struct timespec __user *r) {