diff options
author | john stultz <johnstul@us.ibm.com> | 2005-09-06 18:17:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:34 -0400 |
commit | b149ee2233edf08fb59b11e879a2c5941929bcb8 (patch) | |
tree | 4ee8e066c4d69ac98afc37ab0ab62ae54271ce02 /arch/sh64/kernel/time.c | |
parent | 6c231b7bab0aa6860cd9da2de8a064eddc34c146 (diff) |
[PATCH] NTP: ntp-helper functions
This patch cleans up a commonly repeated set of changes to the NTP state
variables by adding two helper inline functions:
ntp_clear(): Clears the ntp state variables
ntp_synced(): Returns 1 if the system is synced with a time server.
This was compile tested for alpha, arm, i386, x86-64, ppc64, s390, sparc,
sparc64.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sh64/kernel/time.c')
-rw-r--r-- | arch/sh64/kernel/time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c index 926c6fc0619c..f4a62a10053c 100644 --- a/arch/sh64/kernel/time.c +++ b/arch/sh64/kernel/time.c | |||
@@ -247,10 +247,7 @@ int do_settimeofday(struct timespec *tv) | |||
247 | set_normalized_timespec(&xtime, sec, nsec); | 247 | set_normalized_timespec(&xtime, sec, nsec); |
248 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); | 248 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); |
249 | 249 | ||
250 | time_adjust = 0; /* stop active adjtime() */ | 250 | ntp_clear(); |
251 | time_status |= STA_UNSYNC; | ||
252 | time_maxerror = NTP_PHASE_LIMIT; | ||
253 | time_esterror = NTP_PHASE_LIMIT; | ||
254 | write_sequnlock_irq(&xtime_lock); | 251 | write_sequnlock_irq(&xtime_lock); |
255 | clock_was_set(); | 252 | clock_was_set(); |
256 | 253 | ||
@@ -328,7 +325,7 @@ static inline void do_timer_interrupt(int irq, struct pt_regs *regs) | |||
328 | * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be | 325 | * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be |
329 | * called as close as possible to 500 ms before the new second starts. | 326 | * called as close as possible to 500 ms before the new second starts. |
330 | */ | 327 | */ |
331 | if ((time_status & STA_UNSYNC) == 0 && | 328 | if (ntp_synced() && |
332 | xtime.tv_sec > last_rtc_update + 660 && | 329 | xtime.tv_sec > last_rtc_update + 660 && |
333 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && | 330 | (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && |
334 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { | 331 | (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { |