[openap-cvs] : linux/kernel timer.c,1.1.1.1,1.2

[David C Wang <address@hidden>]

Update of /cvsroot/openap/linux/kernel
In directory subversions:/tmp/cvs-serv5742/kernel

Modified Files:
        timer.c 
Log Message:
updated linux kernel pristine sources to openap release 1.1



Index: timer.c
===================================================================
RCS file: /cvsroot/openap/linux/kernel/timer.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- timer.c     14 May 2002 18:51:08 -0000      1.1.1.1
+++ timer.c     14 May 2002 19:53:30 -0000      1.2
@@ -24,6 +24,9 @@
 #include <linux/kernel_stat.h>
 
 #include <asm/uaccess.h>
+#ifdef CONFIG_WL11000
+#include <asm/wl11000.h>
+#endif
 
 /*
  * Timekeeping variables
@@ -674,6 +677,14 @@
 void do_timer(struct pt_regs *regs)
 {
        (*(unsigned long *)&jiffies)++;
+#ifdef CONFIG_WL11000
+       /* Under extreme load the prism driver appears to spend too long in
+        * interrupts and timer bottom halfs don't get run soon enough to
+        * prevent the hardware watchdog from rebooting us.  This is a hack to
+        * ack the watchdog on every time tick.  Eventually we want to fix the
+        * prism driver so this isn't necessary. */
+       wl11000_watchdog_ack(0);
+#endif
 #ifndef CONFIG_SMP
        /* SMP process accounting uses the local APIC timer */