diff options
Diffstat (limited to 'arch/sparc/kernel/time.c')
-rw-r--r-- | arch/sparc/kernel/time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 3b759aefc170..bc015e980341 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
@@ -139,7 +139,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs * regs) | |||
139 | 139 | ||
140 | 140 | ||
141 | /* Determine when to update the Mostek clock. */ | 141 | /* Determine when to update the Mostek clock. */ |
142 | if ((time_status & STA_UNSYNC) == 0 && | 142 | if (ntp_synced() && |
143 | xtime.tv_sec > last_rtc_update + 660 && | 143 | xtime.tv_sec > last_rtc_update + 660 && |
144 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && | 144 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && |
145 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { | 145 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { |
@@ -554,10 +554,7 @@ static int sbus_do_settimeofday(struct timespec *tv) | |||
554 | set_normalized_timespec(&xtime, sec, nsec); | 554 | set_normalized_timespec(&xtime, sec, nsec); |
555 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); | 555 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); |
556 | 556 | ||
557 | time_adjust = 0; /* stop active adjtime() */ | 557 | ntp_clear(); |
558 | time_status |= STA_UNSYNC; | ||
559 | time_maxerror = NTP_PHASE_LIMIT; | ||
560 | time_esterror = NTP_PHASE_LIMIT; | ||
561 | return 0; | 558 | return 0; |
562 | } | 559 | } |
563 | 560 | ||