patch-2.4.7 linux/arch/cris/kernel/time.c
Next file: linux/arch/cris/kernel/traps.c
Previous file: linux/arch/cris/kernel/sys_cris.c
Back to the patch index
Back to the overall index
- Lines: 46
- Date:
Wed Jul 4 11:50:39 2001
- Orig file:
v2.4.6/linux/arch/cris/kernel/time.c
- Orig date:
Thu Feb 8 16:32:44 2001
diff -u --recursive --new-file v2.4.6/linux/arch/cris/kernel/time.c linux/arch/cris/kernel/time.c
@@ -1,4 +1,4 @@
-/* $Id: time.c,v 1.4 2000/10/17 14:44:58 bjornw Exp $
+/* $Id: time.c,v 1.6 2001/05/29 11:29:42 markusl Exp $
*
* linux/arch/cris/kernel/time.c
*
@@ -83,12 +83,9 @@
* avoiding timer inconsistencies (they are rare, but they happen)...
* there are three kinds of problems that must be avoided here:
* 1. the timer counter underflows
- * 2. hardware problem with the timer, not giving us continuous time,
- * the counter does small "jumps" upwards on some Pentium systems,
- * thus causes time warps
- * 3. we are after the timer interrupt, but the bottom half handler
+ * 2. we are after the timer interrupt, but the bottom half handler
* hasn't executed yet.
- */
+ */
if( jiffies_t == jiffies_p ) {
if( count > count_p ) {
}
@@ -195,7 +192,7 @@
return retval;
}
-/* Except from the Etrax100 HSDD about the built-in watchdog:
+/* Excerpt from the Etrax100 HSDD about the built-in watchdog:
*
* 3.10.4 Watchdog timer
@@ -231,14 +228,12 @@
#define WATCHDOG_MIN_FREE_PAGES 8
-extern int nr_free_pages;
-
static inline void
reset_watchdog(void)
{
#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM)
/* only keep watchdog happy as long as we have memory left! */
- if(nr_free_pages > WATCHDOG_MIN_FREE_PAGES) {
+ if(nr_free_pages() > WATCHDOG_MIN_FREE_PAGES) {
/* reset the watchdog with the inverse of the old key */
watchdog_key ^= 0x7; /* invert key, which is 3 bits */
*R_WATCHDOG = IO_FIELD(R_WATCHDOG, key, watchdog_key) |
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)