diff options
| author | phk <phk@FreeBSD.org> | 1998-01-11 19:07:58 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1998-01-11 19:07:58 +0000 |
| commit | dfbd942cf7e4827c057bbcd9b65a0f3e39023d75 (patch) | |
| tree | c9ff8551666701905bb01e9caebbd7fbb94ec148 /sys/kern | |
| parent | 9389702192e1e22dca69679abd75703208e3ee2b (diff) | |
| download | FreeBSD-src-dfbd942cf7e4827c057bbcd9b65a0f3e39023d75.zip FreeBSD-src-dfbd942cf7e4827c057bbcd9b65a0f3e39023d75.tar.gz | |
Try to solve timeout race by not touching softtics here.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_clock.c | 6 | ||||
| -rw-r--r-- | sys/kern/kern_tc.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 8688da2..bd54b41 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.50 1998/01/10 14:55:02 phk Exp $ + * $Id: kern_clock.c,v 1.51 1998/01/11 00:44:27 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -629,9 +629,7 @@ hardclock(frame) CPU_CLOCKUPDATE(&time, &newtime); } - if (TAILQ_FIRST(&callwheel[ticks & callwheelmask]) == NULL) { - softticks++; - } else { + if (TAILQ_FIRST(&callwheel[ticks & callwheelmask]) != NULL) { setsoftclock(); } } diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 8688da2..bd54b41 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.50 1998/01/10 14:55:02 phk Exp $ + * $Id: kern_clock.c,v 1.51 1998/01/11 00:44:27 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -629,9 +629,7 @@ hardclock(frame) CPU_CLOCKUPDATE(&time, &newtime); } - if (TAILQ_FIRST(&callwheel[ticks & callwheelmask]) == NULL) { - softticks++; - } else { + if (TAILQ_FIRST(&callwheel[ticks & callwheelmask]) != NULL) { setsoftclock(); } } |
