diff options
Diffstat (limited to 'arch/v850/kernel')
-rw-r--r-- | arch/v850/kernel/time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c index f722a268238a..ea3fd8844ff0 100644 --- a/arch/v850/kernel/time.c +++ b/arch/v850/kernel/time.c | |||
@@ -66,7 +66,7 @@ static irqreturn_t timer_interrupt (int irq, void *dummy, struct pt_regs *regs) | |||
66 | * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be | 66 | * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be |
67 | * called as close as possible to 500 ms before the new second starts. | 67 | * called as close as possible to 500 ms before the new second starts. |
68 | */ | 68 | */ |
69 | if ((time_status & STA_UNSYNC) == 0 && | 69 | if (ntp_synced() && |
70 | xtime.tv_sec > last_rtc_update + 660 && | 70 | xtime.tv_sec > last_rtc_update + 660 && |
71 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && | 71 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && |
72 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { | 72 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { |
@@ -169,10 +169,7 @@ int do_settimeofday(struct timespec *tv) | |||
169 | xtime.tv_sec = tv->tv_sec; | 169 | xtime.tv_sec = tv->tv_sec; |
170 | xtime.tv_nsec = tv->tv_nsec; | 170 | xtime.tv_nsec = tv->tv_nsec; |
171 | 171 | ||
172 | time_adjust = 0; /* stop active adjtime () */ | 172 | ntp_clear(); |
173 | time_status |= STA_UNSYNC; | ||
174 | time_maxerror = NTP_PHASE_LIMIT; | ||
175 | time_esterror = NTP_PHASE_LIMIT; | ||
176 | 173 | ||
177 | write_sequnlock_irq (&xtime_lock); | 174 | write_sequnlock_irq (&xtime_lock); |
178 | clock_was_set(); | 175 | clock_was_set(); |