Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5cd2880 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

posix-timers: Convert clock_nanosleep to clockid_to_kclock() 



Use the new kclock decoding function in clock_nanosleep and cleanup all
kclocks which use the default functions.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Tested-by: default avatarRichard Cochran <richard.cochran@omicron.at>
LKML-Reference: <20110201134418.034175556@linutronix.de>
parent cc785ac2

drivers/char/mmtimer.c

+0 −1
Original line number Diff line number Diff line
@@ -768,7 +768,6 @@ static struct k_clock sgi_clock = { 
	.clock_set	= sgi_clock_set,

	.clock_get	= sgi_clock_get,

	.timer_create	= sgi_timer_create,

	.nsleep		= do_posix_clock_nonanosleep,

	.timer_set	= sgi_timer_set,

	.timer_del	= sgi_timer_del,

	.timer_get	= sgi_timer_get

include/linux/posix-timers.h

+0 −2
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ extern struct k_clock clock_posix_cpu; 
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_nonanosleep(const clockid_t, int flags, struct timespec *,

			       struct timespec __user *);

int do_posix_clock_nosettime(const clockid_t, const struct timespec *tp);



/* function to call to trigger timer event */

kernel/posix-timers.c

+7 −19
Original line number Diff line number Diff line
@@ -216,12 +216,6 @@ static int no_timer_create(struct k_itimer *new_timer) 
	return -EOPNOTSUPP;

}



static int no_nsleep(const clockid_t which_clock, int flags,

		     struct timespec *tsave, struct timespec __user *rmtp)

{

	return -EOPNOTSUPP;

}



/*

 * Return nonzero if we know a priori this clockid_t value is bogus.

 */
@@ -282,32 +276,31 @@ static __init int init_posix_timers(void) 
{

	struct k_clock clock_realtime = {

		.clock_getres	= hrtimer_get_res,

		.nsleep		= common_nsleep,

	};

	struct k_clock clock_monotonic = {

		.clock_getres	= hrtimer_get_res,

		.clock_get	= posix_ktime_get_ts,

		.clock_set	= do_posix_clock_nosettime,

		.nsleep		= common_nsleep,

	};

	struct k_clock clock_monotonic_raw = {

		.clock_getres	= hrtimer_get_res,

		.clock_get	= posix_get_monotonic_raw,

		.clock_set	= do_posix_clock_nosettime,

		.timer_create	= no_timer_create,

		.nsleep		= no_nsleep,

	};

	struct k_clock clock_realtime_coarse = {

		.clock_getres	= posix_get_coarse_res,

		.clock_get	= posix_get_realtime_coarse,

		.clock_set	= do_posix_clock_nosettime,

		.timer_create	= no_timer_create,

		.nsleep		= no_nsleep,

	};

	struct k_clock clock_monotonic_coarse = {

		.clock_getres	= posix_get_coarse_res,

		.clock_get	= posix_get_monotonic_coarse,

		.clock_set	= do_posix_clock_nosettime,

		.timer_create	= no_timer_create,

		.nsleep		= no_nsleep,

	};



	register_posix_clock(CLOCK_REALTIME, &clock_realtime);
@@ -952,13 +945,6 @@ int do_posix_clock_nosettime(const clockid_t clockid, const struct timespec *tp) 
}

EXPORT_SYMBOL_GPL(do_posix_clock_nosettime);



int do_posix_clock_nonanosleep(const clockid_t clock, int flags,

			       struct timespec *t, struct timespec __user *r)

{

	return -ENANOSLEEP_NOTSUP;

}

EXPORT_SYMBOL_GPL(do_posix_clock_nonanosleep);



SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,

		const struct timespec __user *, tp)

{
@@ -1023,10 +1009,13 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, 
		const struct timespec __user *, rqtp,

		struct timespec __user *, rmtp)

{

	struct k_clock *kc = clockid_to_kclock(which_clock);

	struct timespec t;



	if (invalid_clockid(which_clock))

	if (!kc)

		return -EINVAL;

	if (!kc->nsleep)

		return -ENANOSLEEP_NOTSUP;



	if (copy_from_user(&t, rqtp, sizeof (struct timespec)))

		return -EFAULT;
@@ -1034,8 +1023,7 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, 
	if (!timespec_valid(&t))

		return -EINVAL;



	return CLOCK_DISPATCH(which_clock, nsleep,

			      (which_clock, flags, &t, rmtp));

	return kc->nsleep(which_clock, flags, &t, rmtp);

}



/*