| Message ID | 1261541771.3508.76.camel@localhost.localdomain |
|---|---|
| State | RFC |
| Delegated to: | David Miller |
| Headers | show |
From: john stultz <johnstul@us.ibm.com> Date: Tue, 22 Dec 2009 20:16:11 -0800 > 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. > > I have not built or tested this patch, so help from arch maintainers > would be appreciated. > > Signed-off-by: John Stultz <johnstul@us.ibm.com> This looks fine to me: Acked-by: David S. Miller <davem@davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, john stultz wrote: > 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. > > I have not built or tested this patch, so help from arch maintainers > would be appreciated. > > > Signed-off-by: John Stultz <johnstul@us.ibm.com> > The sparc32 patch does not build because you forgot to remove the last_rtc_update variable declaration: arch/sparc/kernel/time_32.c: In function 'timer_interrupt': arch/sparc/kernel/time_32.c:94: warning: unused variable 'last_rtc_update' Best regards, Kristoffer Glembo -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: gettimeoffset/arch/sparc/Kconfig =================================================================== --- gettimeoffset.orig/arch/sparc/Kconfig 2009-12-22 18:50:54.000000000 -0800 +++ gettimeoffset/arch/sparc/Kconfig 2009-12-22 18:51:25.000000000 -0800 @@ -69,7 +69,7 @@ config GENERIC_TIME config GENERIC_CMOS_UPDATE bool - default y if SPARC64 + default y config GENERIC_CLOCKEVENTS bool Index: gettimeoffset/arch/sparc/kernel/time_32.c =================================================================== --- gettimeoffset.orig/arch/sparc/kernel/time_32.c 2009-12-22 18:50:54.000000000 -0800 +++ gettimeoffset/arch/sparc/kernel/time_32.c 2009-12-22 18:51:25.000000000 -0800 @@ -76,6 +76,11 @@ EXPORT_SYMBOL(profile_pc); __volatile__ unsigned int *master_l10_counter; +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 @@ -99,16 +104,6 @@ static irqreturn_t timer_interrupt(int d 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
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. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz <johnstul@us.ibm.com> --- Kconfig | 2 +- kernel/time_32.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html