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

Commit b149ee22 authored by John Stultz's avatar John Stultz Committed by Linus Torvalds
Browse files

[PATCH] NTP: ntp-helper functions 



This patch cleans up a commonly repeated set of changes to the NTP state
variables by adding two helper inline functions:

ntp_clear(): Clears the ntp state variables

ntp_synced(): Returns 1 if the system is synced with a time server.

This was compile tested for alpha, arm, i386, x86-64, ppc64, s390, sparc,
sparc64.

Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6c231b7b

arch/alpha/kernel/time.c

+2 −5
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ irqreturn_t timer_interrupt(int irq, void *dev, struct pt_regs * regs) 
	 * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be

	 * called as close as possible to 500 ms before the new second starts.

	 */

	if ((time_status & STA_UNSYNC) == 0

	if (ntp_synced()

	    && xtime.tv_sec > state.last_rtc_update + 660

	    && xtime.tv_nsec >= 500000 - ((unsigned) TICK_SIZE) / 2

	    && xtime.tv_nsec <= 500000 + ((unsigned) TICK_SIZE) / 2) {
@@ -502,10 +502,7 @@ do_settimeofday(struct timespec *tv) 
	set_normalized_timespec(&xtime, sec, nsec);

	set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);



	time_adjust = 0;		/* stop active adjtime() */

	time_status |= STA_UNSYNC;

	time_maxerror = NTP_PHASE_LIMIT;

	time_esterror = NTP_PHASE_LIMIT;

	ntp_clear();



	write_sequnlock_irq(&xtime_lock);

	clock_was_set();

arch/arm/kernel/time.c

+2 −5
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static unsigned long next_rtc_update; 
 */

static inline void do_set_rtc(void)

{

	if (time_status & STA_UNSYNC || set_rtc == NULL)

	if (!ntp_synced() || set_rtc == NULL)

		return;



	if (next_rtc_update &&
@@ -292,10 +292,7 @@ int do_settimeofday(struct timespec *tv) 
	set_normalized_timespec(&xtime, sec, nsec);

	set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);



	time_adjust = 0;		/* stop active adjtime() */

	time_status |= STA_UNSYNC;

	time_maxerror = NTP_PHASE_LIMIT;

	time_esterror = NTP_PHASE_LIMIT;

	ntp_clear();

	write_sequnlock_irq(&xtime_lock);

	clock_was_set();

	return 0;

arch/arm26/kernel/time.c

+2 −5
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static unsigned long next_rtc_update; 
 */

static inline void do_set_rtc(void)

{

	if (time_status & STA_UNSYNC || set_rtc == NULL)

	if (!ntp_synced() || set_rtc == NULL)

		return;



//FIXME - timespec.tv_sec is a time_t not unsigned long
@@ -189,10 +189,7 @@ int do_settimeofday(struct timespec *tv) 


	xtime.tv_sec = tv->tv_sec;

	xtime.tv_nsec = tv->tv_nsec;

	time_adjust = 0;		/* stop active adjtime() */

	time_status |= STA_UNSYNC;

	time_maxerror = NTP_PHASE_LIMIT;

	time_esterror = NTP_PHASE_LIMIT;

	ntp_clear();

	write_sequnlock_irq(&xtime_lock);

	clock_was_set();

	return 0;

arch/cris/arch-v10/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 
	 * The division here is not time critical since it will run once in 

	 * 11 minutes

	 */

	if ((time_status & STA_UNSYNC) == 0 &&

	if (ntp_synced() &&

	    xtime.tv_sec > last_rtc_update + 660 &&

	    (xtime.tv_nsec / 1000) >= 500000 - (tick_nsec / 1000) / 2 &&

	    (xtime.tv_nsec / 1000) <= 500000 + (tick_nsec / 1000) / 2) {

arch/cris/kernel/time.c

+1 −4
Original line number Diff line number Diff line
@@ -114,10 +114,7 @@ int do_settimeofday(struct timespec *tv) 
	set_normalized_timespec(&xtime, sec, nsec);

	set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);



	time_adjust = 0;		/* stop active adjtime() */

	time_status |= STA_UNSYNC;

	time_maxerror = NTP_PHASE_LIMIT;

	time_esterror = NTP_PHASE_LIMIT;

	ntp_clear();

	write_sequnlock_irq(&xtime_lock);

	clock_was_set();

	return 0;