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/xtensa/kernel | |
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/xtensa/kernel')
-rw-r--r-- | arch/xtensa/kernel/time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index e07287db5a40..1ac7d5ce7456 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c | |||
@@ -122,10 +122,7 @@ int do_settimeofday(struct timespec *tv) | |||
122 | set_normalized_timespec(&xtime, sec, nsec); | 122 | set_normalized_timespec(&xtime, sec, nsec); |
123 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); | 123 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); |
124 | 124 | ||
125 | time_adjust = 0; /* stop active adjtime() */ | 125 | ntp_clear(); |
126 | time_status |= STA_UNSYNC; | ||
127 | time_maxerror = NTP_PHASE_LIMIT; | ||
128 | time_esterror = NTP_PHASE_LIMIT; | ||
129 | write_sequnlock_irq(&xtime_lock); | 126 | write_sequnlock_irq(&xtime_lock); |
130 | return 0; | 127 | return 0; |
131 | } | 128 | } |
@@ -184,7 +181,7 @@ again: | |||
184 | next += CCOUNT_PER_JIFFY; | 181 | next += CCOUNT_PER_JIFFY; |
185 | do_timer (regs); /* Linux handler in kernel/timer.c */ | 182 | do_timer (regs); /* Linux handler in kernel/timer.c */ |
186 | 183 | ||
187 | if ((time_status & STA_UNSYNC) == 0 && | 184 | if (ntp_synced() && |
188 | xtime.tv_sec - last_rtc_update >= 659 && | 185 | xtime.tv_sec - last_rtc_update >= 659 && |
189 | abs((xtime.tv_nsec/1000)-(1000000-1000000/HZ))<5000000/HZ && | 186 | abs((xtime.tv_nsec/1000)-(1000000-1000000/HZ))<5000000/HZ && |
190 | jiffies - wall_jiffies == 1) { | 187 | jiffies - wall_jiffies == 1) { |