Update of /cvsroot/linux-mips/linux/arch/mips/mips-boards/generic
In directory usw-pr-cvs1:/tmp/cvs-serv13849/arch/mips/mips-boards/generic
Modified Files:
time.c
Log Message:
Synced to 2.4.10.
Index: time.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mips-boards/generic/time.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- time.c 2001/10/15 22:57:28 1.4
+++ time.c 2001/10/19 21:19:38 1.5
@@ -32,8 +32,10 @@
#include <asm/mipsregs.h>
#include <asm/ptrace.h>
+#include <asm/hardirq.h>
#include <asm/div64.h>
+#include <linux/interrupt.h>
#include <linux/mc146818rtc.h>
#include <linux/timex.h>
@@ -156,12 +158,13 @@
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))
+ && xtime.tv_usec <= 500000 + (tick >> 1)) {
if (set_rtc_mmss(xtime.tv_sec) == 0)
last_rtc_update = xtime.tv_sec;
else
/* do it again in 60 s */
last_rtc_update = xtime.tv_sec - 600;
+ }
read_unlock(&xtime_lock);
if ((timer_tick_count++ % HZ) == 0) {
|
