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

Commit 7e1b5847 authored by John Stultz's avatar John Stultz Committed by Thomas Gleixner
Browse files

ntp: Cleanup xtime references in ntp.c 



ntp.c doesn't need to access timekeeping internals directly, so change
xtime references to use the get_seconds() timekeeping interface.

Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Cc: richard@rsk.demon.co.uk
LKML-Reference: <1264738844-21935-1-git-send-email-johnstul@us.ibm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1f5b8f8a

kernel/time/ntp.c

+3 −3
Original line number Diff line number Diff line
@@ -142,11 +142,11 @@ static void ntp_update_offset(long offset) 
	 * Select how the frequency is to be controlled

	 * and in which mode (PLL or FLL).

	 */

	secs = xtime.tv_sec - time_reftime;

	secs = get_seconds() - time_reftime;

	if (unlikely(time_status & STA_FREQHOLD))

		secs = 0;



	time_reftime = xtime.tv_sec;

	time_reftime = get_seconds();



	offset64    = offset;

	freq_adj    = (offset64 * secs) <<
@@ -368,7 +368,7 @@ static inline void process_adj_status(struct timex *txc, struct timespec *ts) 
	 * reference time to current time.

	 */

	if (!(time_status & STA_PLL) && (txc->status & STA_PLL))

		time_reftime = xtime.tv_sec;

		time_reftime = get_seconds();



	/* only set allowed bits */

	time_status &= STA_RONLY;