diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_clock.c | 8 | ||||
| -rw-r--r-- | sys/kern/kern_tc.c | 8 | ||||
| -rw-r--r-- | sys/kern/kern_timeout.c | 8 |
3 files changed, 14 insertions, 10 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 87ac79c..8688da2 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.49 1998/01/10 13:16:19 phk Exp $ + * $Id: kern_clock.c,v 1.50 1998/01/10 14:55:02 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -629,7 +629,11 @@ hardclock(frame) CPU_CLOCKUPDATE(&time, &newtime); } - setsoftclock(); + if (TAILQ_FIRST(&callwheel[ticks & callwheelmask]) == NULL) { + softticks++; + } else { + setsoftclock(); + } } void diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 87ac79c..8688da2 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.49 1998/01/10 13:16:19 phk Exp $ + * $Id: kern_clock.c,v 1.50 1998/01/10 14:55:02 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -629,7 +629,11 @@ hardclock(frame) CPU_CLOCKUPDATE(&time, &newtime); } - setsoftclock(); + if (TAILQ_FIRST(&callwheel[ticks & callwheelmask]) == NULL) { + softticks++; + } else { + setsoftclock(); + } } void diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index a3c4462..2390b4d 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_timeout.c,v 1.49 1998/01/10 13:16:26 phk Exp $ + * $Id: kern_timeout.c,v 1.50 1998/01/10 14:55:14 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -82,7 +82,7 @@ struct callout_list callfree; int callwheelsize, callwheelbits, callwheelmask; struct callout_tailq *callwheel; -static int softticks; /* Like ticks, but for softclock(). */ +int softticks; /* Like ticks, but for softclock(). */ static struct callout *nextsoftcheck; /* Next callout to be checked. */ /* @@ -119,10 +119,6 @@ softclock() * we last allowed interrupts. */ - if (TAILQ_FIRST(&callwheel[ticks & callwheelmask]) == NULL) { - softticks++; - return; - } (void)splsoftclock(); |
