diff options
Diffstat (limited to 'arch/m68knommu')
-rw-r--r-- | arch/m68knommu/kernel/time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c index 5c3ca671627c..b17c1ecba966 100644 --- a/arch/m68knommu/kernel/time.c +++ b/arch/m68knommu/kernel/time.c | |||
@@ -68,7 +68,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs) | |||
68 | * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be | 68 | * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be |
69 | * called as close as possible to 500 ms before the new second starts. | 69 | * called as close as possible to 500 ms before the new second starts. |
70 | */ | 70 | */ |
71 | if ((time_status & STA_UNSYNC) == 0 && | 71 | if (ntp_synced() && |
72 | xtime.tv_sec > last_rtc_update + 660 && | 72 | xtime.tv_sec > last_rtc_update + 660 && |
73 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && | 73 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && |
74 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { | 74 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { |
@@ -178,10 +178,7 @@ int do_settimeofday(struct timespec *tv) | |||
178 | set_normalized_timespec(&xtime, sec, nsec); | 178 | set_normalized_timespec(&xtime, sec, nsec); |
179 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); | 179 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); |
180 | 180 | ||
181 | time_adjust = 0; /* stop active adjtime() */ | 181 | ntp_clear(); |
182 | time_status |= STA_UNSYNC; | ||
183 | time_maxerror = NTP_PHASE_LIMIT; | ||
184 | time_esterror = NTP_PHASE_LIMIT; | ||
185 | write_sequnlock_irq(&xtime_lock); | 182 | write_sequnlock_irq(&xtime_lock); |
186 | clock_was_set(); | 183 | clock_was_set(); |
187 | return 0; | 184 | return 0; |