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

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

sparc: Convert sparc to use read/update_persistent_clock 



This patch converts the sparc architecture to use the generic
read_persistent_clock and update_persistent_clock interfaces, reducing
the amount of arch specific code we have to maintain, and allowing for
further cleanups in the future.

[ davem: compile fix: Here's a version that compiles, you have to get
  rid of the now unused variably last_rtc_update since we build with
  -Werror ]
 
Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: sparclinux@vger.kernel.org
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8eff8a5c

arch/sparc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ config ARCH_USES_GETTIMEOFFSET 


config GENERIC_CMOS_UPDATE

	bool

	default y if SPARC64

	default y



config GENERIC_CLOCKEVENTS

	bool

arch/sparc/kernel/time_32.c

+5 −13
Original line number Diff line number Diff line
@@ -78,6 +78,11 @@ __volatile__ unsigned int *master_l10_counter; 


u32 (*do_arch_gettimeoffset)(void);



int update_persistent_clock(struct timespec now)

{

	return set_rtc_mmss(now.tv_sec);

}



/*

 * timer_interrupt() needs to keep up the real-time clock,

 * as well as call the "do_timer()" routine every clocktick
@@ -87,9 +92,6 @@ u32 (*do_arch_gettimeoffset)(void); 


static irqreturn_t timer_interrupt(int dummy, void *dev_id)

{

	/* last time the cmos clock got updated */

	static long last_rtc_update;



#ifndef CONFIG_SMP

	profile_tick(CPU_PROFILING);

#endif
@@ -101,16 +103,6 @@ static irqreturn_t timer_interrupt(int dummy, void *dev_id) 


	do_timer(1);



	/* Determine when to update the Mostek clock. */

	if (ntp_synced() &&

	    xtime.tv_sec > last_rtc_update + 660 &&

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

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

	  if (set_rtc_mmss(xtime.tv_sec) == 0)

	    last_rtc_update = xtime.tv_sec;

	  else

	    last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */

	}

	write_sequnlock(&xtime_lock);



#ifndef CONFIG_SMP