diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /arch/mips/sgi/kernel/indy_timer.c | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'arch/mips/sgi/kernel/indy_timer.c')
| -rw-r--r-- | arch/mips/sgi/kernel/indy_timer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/mips/sgi/kernel/indy_timer.c b/arch/mips/sgi/kernel/indy_timer.c index 0920b9d2c..11980d75a 100644 --- a/arch/mips/sgi/kernel/indy_timer.c +++ b/arch/mips/sgi/kernel/indy_timer.c @@ -1,4 +1,4 @@ -/* $Id: indy_timer.c,v 1.10 1998/08/25 09:14:49 ralf Exp $ +/* $Id: indy_timer.c,v 1.11 1999/01/04 16:03:56 ralf Exp $ * * indy_timer.c: Setting up the clock on the INDY 8254 controller. * @@ -104,9 +104,10 @@ void indy_timer_interrupt(struct pt_regs *regs) * absolutely sure we do this update within 500ms before the * next second starts, thus the following code. */ - if (time_state != TIME_BAD && xtime.tv_sec > last_rtc_update + 660 && - xtime.tv_usec > 500000 - (tick >> 1) && - xtime.tv_usec < 500000 + (tick >> 1)) + if ((time_status & STA_UNSYNC) == 0 && + xtime.tv_sec > last_rtc_update + 660 && + xtime.tv_usec >= 500000 - (tick >> 1) && + xtime.tv_usec <= 500000 + (tick >> 1)) if (set_rtc_mmss(xtime.tv_sec) == 0) last_rtc_update = xtime.tv_sec; else |