2 files changed, 14 insertions, 28 deletions

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 8e8441587c22..bfd35304d586 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -58,6 +58,10 @@ config GENERIC_TIME
         bool
         default y
 
+config GENERIC_CMOS_UPDATE
+        bool
+        default y
+
 config TIME_LOW_RES
         bool
         default y
diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c
index d33ed9a84cc7..67944aa27280 100644
--- a/arch/m68knommu/kernel/time.c
+++ b/arch/m68knommu/kernel/time.c
@@ -33,27 +33,6 @@ static inline int set_rtc_mmss(unsigned long nowtime)
         return -1;
 }
 
-static inline void do_set_rtc(void)
-{
-        /* last time the cmos clock got updated */
-        static long last_rtc_update=0;
-
-        /*
-         * 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.
-         */
-        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 */
-        }
-}
-
 /*
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
@@ -68,8 +47,6 @@ irqreturn_t arch_timer_interrupt(int irq, void *dummy)
 
         do_timer(1);
 
-        do_set_rtc();
-
         write_sequnlock(&xtime_lock);
 
 #ifndef CONFIG_SMP
@@ -93,12 +70,17 @@ static unsigned long read_rtc_mmss(void)
         return  mktime(year, mon, day, hour, min, sec);;
 }
 
-void time_init(void)
+unsigned long read_persistent_clock(void)
+{
+        return read_rtc_mmss();
+}
+
+int update_persistent_clock(struct timespec now)
 {
-        xtime.tv_sec = read_rtc_mmss();
-        xtime.tv_nsec = 0;
-        wall_to_monotonic.tv_sec = -xtime.tv_sec;
+        return set_rtc_mmss(now.tv_sec);
+}
 
+void time_init(void)
+{
         hw_timer_init();
 }
-