summaryrefslogtreecommitdiffstats
path: root/arch/v850
diff options
context:
space:
mode:
authorjohn stultz <johnstul@us.ibm.com>2005-09-06 15:17:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 16:57:34 -0700
commitb149ee2233edf08fb59b11e879a2c5941929bcb8 (patch)
tree4ee8e066c4d69ac98afc37ab0ab62ae54271ce02 /arch/v850
parent6c231b7bab0aa6860cd9da2de8a064eddc34c146 (diff)
downloadlinux-stable-b149ee2233edf08fb59b11e879a2c5941929bcb8.tar.gz
linux-stable-b149ee2233edf08fb59b11e879a2c5941929bcb8.tar.bz2
linux-stable-b149ee2233edf08fb59b11e879a2c5941929bcb8.zip
[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/v850')
-rw-r--r--arch/v850/kernel/time.c7
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)
* CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
* called as close as possible to 500 ms before the new second starts.
*/
- if ((time_status & STA_UNSYNC) == 0 &&
+ if (ntp_synced() &&
xtime.tv_sec > last_rtc_update + 660 &&
(xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
(xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
@@ -169,10 +169,7 @@ int do_settimeofday(struct timespec *tv)
xtime.tv_sec = tv->tv_sec;
xtime.tv_nsec = tv->tv_nsec;
- time_adjust = 0; /* stop active adjtime () */
- time_status |= STA_UNSYNC;
- time_maxerror = NTP_PHASE_LIMIT;
- time_esterror = NTP_PHASE_LIMIT;
+ ntp_clear();
write_sequnlock_irq (&xtime_lock);
clock_was_set();