[RFC][PATCH 10/14] Convert m68k to read/update_persistent_clock

john stultz
2009-12-23T04:11:31Z

This patch converts the m68k 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>
---
time.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

Index: gettimeoffset/arch/m68k/kernel/time.c
===================================================================
--- gettimeoffset.orig/arch/m68k/kernel/time.c 2009-12-22 18:50:54.000000000 -0800
+++ gettimeoffset/arch/m68k/kernel/time.c 2009-12-22 18:51:18.000000000 -0800
@@ -73,21 +73,24 @@ static irqreturn_t timer_interrupt(int i
return IRQ_HANDLED;
}

-void __init time_init(void)
+void read_persistent_clock(struct timespec *ts)
{
struct rtc_time time;
+ ts->tv_sec = 0;
+ ts->tv_nsec = 0;

if (mach_hwclk) {
mach_hwclk(0, &time);

if ((time.tm_year += 1900) < 1970)
time.tm_year += 100;
- xtime.tv_sec = mktime(time.tm_year, time.tm_mon, time.tm_mday,
+ ts->tv_sec = mktime(time.tm_year, time.tm_mon, time.tm_mday,
time.tm_hour, time.tm_min, time.tm_sec);
- xtime.tv_nsec = 0;
}
- wall_to_monotonic.tv_sec = -xtime.tv_sec;
+}

+void __init time_init(void)
+{
mach_sched_init(timer_interrupt);
}