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

Commit 82644459 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

NTP: move the cmos update code into ntp.c 



i386 and sparc64 have the identical code to update the cmos clock.  Move it
into kernel/time/ntp.c as there are other architectures coming along with the
same requirements.

[akpm@linux-foundation.org: build fixes]
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Cc: David Miller <davem@davemloft.net>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 99bc2fcb

arch/i386/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ config GENERIC_TIME 
	bool

	default y



config GENERIC_CMOS_UPDATE

	bool

	default y



config CLOCKSOURCE_WATCHDOG

	bool

	default y

arch/i386/kernel/time.c

+2 −48
Original line number Diff line number Diff line
@@ -207,55 +207,9 @@ unsigned long read_persistent_clock(void) 
	return retval;

}



static void sync_cmos_clock(unsigned long dummy);



static DEFINE_TIMER(sync_cmos_timer, sync_cmos_clock, 0, 0);

int no_sync_cmos_clock;



static void sync_cmos_clock(unsigned long dummy)

{

	struct timeval now, next;

	int fail = 1;



	/*

	 * If we have an externally synchronized Linux clock, then update

	 * 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.

	 * This code is run on a timer.  If the clock is set, that timer

	 * may not expire at the correct time.  Thus, we adjust...

	 */

	if (!ntp_synced())

		/*

		 * Not synced, exit, do not restart a timer (if one is

		 * running, let it run out).

		 */

		return;



	do_gettimeofday(&now);

	if (now.tv_usec >= USEC_AFTER - ((unsigned) TICK_SIZE) / 2 &&

	    now.tv_usec <= USEC_BEFORE + ((unsigned) TICK_SIZE) / 2)

		fail = set_rtc_mmss(now.tv_sec);



	next.tv_usec = USEC_AFTER - now.tv_usec;

	if (next.tv_usec <= 0)

		next.tv_usec += USEC_PER_SEC;



	if (!fail)

		next.tv_sec = 659;

	else

		next.tv_sec = 0;



	if (next.tv_usec >= USEC_PER_SEC) {

		next.tv_sec++;

		next.tv_usec -= USEC_PER_SEC;

	}

	mod_timer(&sync_cmos_timer, jiffies + timeval_to_jiffies(&next));

}



void notify_arch_cmos_timer(void)

int update_persistent_clock(struct timespec now)

{

	if (!no_sync_cmos_clock)

		mod_timer(&sync_cmos_timer, jiffies + 1);

	return set_rtc_mmss(now.tv_sec);

}



extern void (*late_time_init)(void);

arch/sparc64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ config GENERIC_TIME 
	bool

	default y



config GENERIC_CMOS_UPDATE

	bool

	default y



config GENERIC_CLOCKEVENTS

	bool

	default y

arch/sparc64/kernel/time.c

+2 −51
Original line number Diff line number Diff line
@@ -403,58 +403,9 @@ static struct sparc64_tick_ops hbtick_operations __read_mostly = { 


static unsigned long timer_ticks_per_nsec_quotient __read_mostly;



#define TICK_SIZE (tick_nsec / 1000)



#define USEC_AFTER	500000

#define USEC_BEFORE	500000



static void sync_cmos_clock(unsigned long dummy);



static DEFINE_TIMER(sync_cmos_timer, sync_cmos_clock, 0, 0);



static void sync_cmos_clock(unsigned long dummy)

{

	struct timeval now, next;

	int fail = 1;



	/*

	 * If we have an externally synchronized Linux clock, then update

	 * 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.

	 * This code is run on a timer.  If the clock is set, that timer

	 * may not expire at the correct time.  Thus, we adjust...

	 */

	if (!ntp_synced())

		/*

		 * Not synced, exit, do not restart a timer (if one is

		 * running, let it run out).

		 */

		return;



	do_gettimeofday(&now);

	if (now.tv_usec >= USEC_AFTER - ((unsigned) TICK_SIZE) / 2 &&

	    now.tv_usec <= USEC_BEFORE + ((unsigned) TICK_SIZE) / 2)

		fail = set_rtc_mmss(now.tv_sec);



	next.tv_usec = USEC_AFTER - now.tv_usec;

	if (next.tv_usec <= 0)

		next.tv_usec += USEC_PER_SEC;



	if (!fail)

		next.tv_sec = 659;

	else

		next.tv_sec = 0;



	if (next.tv_usec >= USEC_PER_SEC) {

		next.tv_sec++;

		next.tv_usec -= USEC_PER_SEC;

	}

	mod_timer(&sync_cmos_timer, jiffies + timeval_to_jiffies(&next));

}



void notify_arch_cmos_timer(void)

int update_persistent_clock(struct timespec now)

{

	mod_timer(&sync_cmos_timer, jiffies + 1);

	return set_rtc_mmss(now.tv_sec);

}



/* Kick start a stopped clock (procedure from the Sun NVRAM/hostid FAQ). */

include/asm-i386/timer.h

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ unsigned long native_calculate_cpu_khz(void); 


extern int timer_ack;

extern int no_timer_check;

extern int no_sync_cmos_clock;

extern int recalibrate_cpu_khz(void);



#ifndef CONFIG_PARAVIRT