diff options
Diffstat (limited to 'arch/arm26')
-rw-r--r-- | arch/arm26/kernel/time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm26/kernel/time.c b/arch/arm26/kernel/time.c index 549a6b2e177e..e66aedd02fad 100644 --- a/arch/arm26/kernel/time.c +++ b/arch/arm26/kernel/time.c | |||
@@ -114,7 +114,7 @@ static unsigned long next_rtc_update; | |||
114 | */ | 114 | */ |
115 | static inline void do_set_rtc(void) | 115 | static inline void do_set_rtc(void) |
116 | { | 116 | { |
117 | if (time_status & STA_UNSYNC || set_rtc == NULL) | 117 | if (!ntp_synced() || set_rtc == NULL) |
118 | return; | 118 | return; |
119 | 119 | ||
120 | //FIXME - timespec.tv_sec is a time_t not unsigned long | 120 | //FIXME - timespec.tv_sec is a time_t not unsigned long |
@@ -189,10 +189,7 @@ int do_settimeofday(struct timespec *tv) | |||
189 | 189 | ||
190 | xtime.tv_sec = tv->tv_sec; | 190 | xtime.tv_sec = tv->tv_sec; |
191 | xtime.tv_nsec = tv->tv_nsec; | 191 | xtime.tv_nsec = tv->tv_nsec; |
192 | time_adjust = 0; /* stop active adjtime() */ | 192 | ntp_clear(); |
193 | time_status |= STA_UNSYNC; | ||
194 | time_maxerror = NTP_PHASE_LIMIT; | ||
195 | time_esterror = NTP_PHASE_LIMIT; | ||
196 | write_sequnlock_irq(&xtime_lock); | 193 | write_sequnlock_irq(&xtime_lock); |
197 | clock_was_set(); | 194 | clock_was_set(); |
198 | return 0; | 195 | return 0; |