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

Commit 26f9a479 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

posix-timers: Convert clock_settime to clockid_to_kclock() 



Use the new kclock decoding function in clock_settime and cleanup all
kclocks which use the default functions. Rename the misnomed
common_clock_set() to posix_clock_realtime_set().

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.518851246@linutronix.de>
parent 79c9da0d

include/linux/posix-timers.h

+0 −3
Original line number Diff line number Diff line
@@ -89,9 +89,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_nosettime(const clockid_t, const struct timespec *tp);



/* function to call to trigger timer event */

int posix_timer_event(struct k_itimer *timr, int si_private);

kernel/posix-cpu-timers.c

+0 −2
Original line number Diff line number Diff line
@@ -1604,7 +1604,6 @@ static __init int init_posix_cpu_timers(void) 
	struct k_clock process = {

		.clock_getres	= process_cpu_clock_getres,

		.clock_get	= process_cpu_clock_get,

		.clock_set	= do_posix_clock_nosettime,

		.timer_create	= process_cpu_timer_create,

		.nsleep		= process_cpu_nsleep,

		.nsleep_restart	= process_cpu_nsleep_restart,
@@ -1612,7 +1611,6 @@ static __init int init_posix_cpu_timers(void) 
	struct k_clock thread = {

		.clock_getres	= thread_cpu_clock_getres,

		.clock_get	= thread_cpu_clock_get,

		.clock_set	= do_posix_clock_nosettime,

		.timer_create	= thread_cpu_timer_create,

	};

	struct timespec ts;

kernel/posix-timers.c

+12 −19
Original line number Diff line number Diff line
@@ -199,12 +199,6 @@ static int common_clock_get(clockid_t which_clock, struct timespec *tp) 
	return 0;

}



static inline int common_clock_set(const clockid_t which_clock,

				   const struct timespec *tp)

{

	return do_sys_settimeofday(tp, NULL);

}



static int common_timer_create(struct k_itimer *new_timer)

{

	hrtimer_init(&new_timer->it.real.timer, new_timer->it_clock, 0);
@@ -232,6 +226,13 @@ static inline int invalid_clockid(const clockid_t which_clock) 
	return 1;

}



/* Set clock_realtime */

static int posix_clock_realtime_set(const clockid_t which_clock,

				    const struct timespec *tp)

{

	return do_sys_settimeofday(tp, NULL);

}



/*

 * Get monotonic time for posix timers

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

	struct k_clock clock_realtime = {

		.clock_getres	= hrtimer_get_res,

		.clock_set	= posix_clock_realtime_set,

		.nsleep		= common_nsleep,

		.nsleep_restart	= hrtimer_nanosleep_restart,

	};

	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,

		.nsleep_restart	= hrtimer_nanosleep_restart,

	};

	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,

	};

	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,

	};

	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,

	};
@@ -940,24 +938,19 @@ void exit_itimers(struct signal_struct *sig) 
	}

}



/* Not available / possible... functions */

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

{

	return -EINVAL;

}

EXPORT_SYMBOL_GPL(do_posix_clock_nosettime);



SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,

		const struct timespec __user *, tp)

{

	struct k_clock *kc = clockid_to_kclock(which_clock);

	struct timespec new_tp;



	if (invalid_clockid(which_clock))

	if (!kc || !kc->clock_set)

		return -EINVAL;



	if (copy_from_user(&new_tp, tp, sizeof (*tp)))

		return -EFAULT;



	return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));

	return kc->clock_set(which_clock, &new_tp);

}



SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,