Merge /spare/repo/linux-2.6/

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c
index 8a2b77bc5749..539c562cd54d 100644
--- a/arch/m32r/kernel/time.c
+++ b/arch/m32r/kernel/time.c
@@ -171,10 +171,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
 
@@ -221,7 +218,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
          * called as close as possible to 500 ms before the new second starts.
          */
         write_seqlock(&xtime_lock);
-        if ((time_status & STA_UNSYNC) == 0
+        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)