Commit-ID: 79c9da0d0539fb341a1b48a2a5a23d974726de90 Gitweb: http://git.kernel.org/tip/79c9da0d0539fb341a1b48a2a5a23d974726de90 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Tue, 1 Feb 2011 13:51:45 +0000 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Wed, 2 Feb 2011 15:28:14 +0100 posix-cpu-timers: Remove the stub nanosleep functions CLOCK_THREAD_CPUTIME_ID implements stub functions for nanosleep and nanosleep_restart, which return -EINVAL. That return value is wrong. The correct return value is -ENOTSUP. Remove the stubs and let the new dispatch code return the correct error code. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Acked-by: John Stultz <johnstul@xxxxxxxxxx> Tested-by: Richard Cochran <richard.cochran@xxxxxxxxxx> LKML-Reference: <20110201134418.422446502@xxxxxxxxxxxxx> --- kernel/posix-cpu-timers.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index 9e617b0..8dc4cd7 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c @@ -1586,15 +1586,6 @@ static int thread_cpu_timer_create(struct k_itimer *timer) timer->it_clock = THREAD_CLOCK; return posix_cpu_timer_create(timer); } -static int thread_cpu_nsleep(const clockid_t which_clock, int flags, - struct timespec *rqtp, struct timespec __user *rmtp) -{ - return -EINVAL; -} -static long thread_cpu_nsleep_restart(struct restart_block *restart_block) -{ - return -EINVAL; -} struct k_clock clock_posix_cpu = { .clock_getres = posix_cpu_clock_getres, @@ -1623,8 +1614,6 @@ static __init int init_posix_cpu_timers(void) .clock_get = thread_cpu_clock_get, .clock_set = do_posix_clock_nosettime, .timer_create = thread_cpu_timer_create, - .nsleep = thread_cpu_nsleep, - .nsleep_restart = thread_cpu_nsleep_restart, }; struct timespec ts; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html