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/cris/arch-v10/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/cris/arch-v10/kernel/time.c')
-rw-r--r-- | arch/cris/arch-v10/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c index 6b7b4e0802e3..dc3dfe9b4a1a 100644 --- a/arch/cris/arch-v10/kernel/time.c +++ b/arch/cris/arch-v10/kernel/time.c | |||
@@ -240,7 +240,7 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
240 | * The division here is not time critical since it will run once in | 240 | * The division here is not time critical since it will run once in |
241 | * 11 minutes | 241 | * 11 minutes |
242 | */ | 242 | */ |
243 | if ((time_status & STA_UNSYNC) == 0 && | 243 | if (ntp_synced() && |
244 | xtime.tv_sec > last_rtc_update + 660 && | 244 | xtime.tv_sec > last_rtc_update + 660 && |
245 | (xtime.tv_nsec / 1000) >= 500000 - (tick_nsec / 1000) / 2 && | 245 | (xtime.tv_nsec / 1000) >= 500000 - (tick_nsec / 1000) / 2 && |
246 | (xtime.tv_nsec / 1000) <= 500000 + (tick_nsec / 1000) / 2) { | 246 | (xtime.tv_nsec / 1000) <= 500000 + (tick_nsec / 1000) / 2) { |