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

Commit cef90377 authored by John Stultz's avatar John Stultz
Browse files

timekeeping: Move ADJ_SETOFFSET to top level do_adjtimex() 



Since ADJ_SETOFFSET adjusts the timekeeping state, process
it as part of the top level do_adjtimex() function in
timekeeping.c.

This avoids deadlocks that could occur once we change the
ntp locking rules.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 87ace39b

kernel/time/ntp.c

+0 −11
Original line number Diff line number Diff line
@@ -666,17 +666,6 @@ int __do_adjtimex(struct timex *txc, struct timespec *ts, s32 *time_tai) 
{

	int result;



	if (txc->modes & ADJ_SETOFFSET) {

		struct timespec delta;

		delta.tv_sec  = txc->time.tv_sec;

		delta.tv_nsec = txc->time.tv_usec;

		if (!(txc->modes & ADJ_NANO))

			delta.tv_nsec *= 1000;

		result = timekeeping_inject_offset(&delta);

		if (result)

			return result;

	}



	raw_spin_lock_irq(&ntp_lock);



	if (txc->modes & ADJ_ADJTIME) {

kernel/time/timekeeping.c

+11 −0
Original line number Diff line number Diff line
@@ -1627,6 +1627,17 @@ int do_adjtimex(struct timex *txc) 
	if (ret)

		return ret;



	if (txc->modes & ADJ_SETOFFSET) {

		struct timespec delta;

		delta.tv_sec  = txc->time.tv_sec;

		delta.tv_nsec = txc->time.tv_usec;

		if (!(txc->modes & ADJ_NANO))

			delta.tv_nsec *= 1000;

		ret = timekeeping_inject_offset(&delta);

		if (ret)

			return ret;

	}



	getnstimeofday(&ts);

	orig_tai = tai = timekeeping_get_tai_offset();