diff options
Diffstat (limited to 'arch/mips/kernel/time.c')
-rw-r--r-- | arch/mips/kernel/time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 648c82292ed6..0dd0df7a3b04 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c | |||
@@ -223,10 +223,7 @@ int do_settimeofday(struct timespec *tv) | |||
223 | set_normalized_timespec(&xtime, sec, nsec); | 223 | set_normalized_timespec(&xtime, sec, nsec); |
224 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); | 224 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); |
225 | 225 | ||
226 | time_adjust = 0; /* stop active adjtime() */ | 226 | ntp_clear(); |
227 | time_status |= STA_UNSYNC; | ||
228 | time_maxerror = NTP_PHASE_LIMIT; | ||
229 | time_esterror = NTP_PHASE_LIMIT; | ||
230 | 227 | ||
231 | write_sequnlock_irq(&xtime_lock); | 228 | write_sequnlock_irq(&xtime_lock); |
232 | clock_was_set(); | 229 | clock_was_set(); |
@@ -442,7 +439,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
442 | * called as close as possible to 500 ms before the new second starts. | 439 | * called as close as possible to 500 ms before the new second starts. |
443 | */ | 440 | */ |
444 | write_seqlock(&xtime_lock); | 441 | write_seqlock(&xtime_lock); |
445 | if ((time_status & STA_UNSYNC) == 0 && | 442 | if (ntp_synced() && |
446 | xtime.tv_sec > last_rtc_update + 660 && | 443 | xtime.tv_sec > last_rtc_update + 660 && |
447 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && | 444 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && |
448 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { | 445 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { |