diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index d5f5aedde0a3..02ca69918d7c 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c | |||
@@ -215,10 +215,7 @@ int do_settimeofday(struct timespec *tv) | |||
215 | set_normalized_timespec(&xtime, sec, nsec); | 215 | set_normalized_timespec(&xtime, sec, nsec); |
216 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); | 216 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); |
217 | 217 | ||
218 | time_adjust = 0; /* stop active adjtime() */ | 218 | ntp_clear(); |
219 | time_status |= STA_UNSYNC; | ||
220 | time_maxerror = NTP_PHASE_LIMIT; | ||
221 | time_esterror = NTP_PHASE_LIMIT; | ||
222 | write_sequnlock_irq(&xtime_lock); | 219 | write_sequnlock_irq(&xtime_lock); |
223 | clock_was_set(); | 220 | clock_was_set(); |
224 | 221 | ||
@@ -252,7 +249,7 @@ static inline void do_timer_interrupt(int irq, struct pt_regs *regs) | |||
252 | * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be | 249 | * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be |
253 | * called as close as possible to 500 ms before the new second starts. | 250 | * called as close as possible to 500 ms before the new second starts. |
254 | */ | 251 | */ |
255 | if ((time_status & STA_UNSYNC) == 0 && | 252 | if (ntp_synced() && |
256 | xtime.tv_sec > last_rtc_update + 660 && | 253 | xtime.tv_sec > last_rtc_update + 660 && |
257 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && | 254 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && |
258 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { | 255 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { |