diff options
| author | phk <phk@FreeBSD.org> | 1998-01-10 14:55:14 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1998-01-10 14:55:14 +0000 |
| commit | 2c2c366569949a5603feb14d43b09fc2be96756c (patch) | |
| tree | 9a9a97ae91b062797fe70ecbbb5ecbca386415b7 | |
| parent | 1cc31c4aa67a2c5b70cfae35630a90073c953ca9 (diff) | |
| download | FreeBSD-src-2c2c366569949a5603feb14d43b09fc2be96756c.zip FreeBSD-src-2c2c366569949a5603feb14d43b09fc2be96756c.tar.gz | |
Whoops. softclock is called from doreti_swi as well. Abandon call from
hardclock().
Forgot this:
Pointed hat sent by: bd
| -rw-r--r-- | sys/kern/kern_clock.c | 6 | ||||
| -rw-r--r-- | sys/kern/kern_tc.c | 6 | ||||
| -rw-r--r-- | sys/kern/kern_timeout.c | 10 |
3 files changed, 8 insertions, 14 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index ed85804..87ac79c 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.48 1998/01/07 12:29:17 phk Exp $ + * $Id: kern_clock.c,v 1.49 1998/01/10 13:16:19 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -628,8 +628,8 @@ hardclock(frame) } CPU_CLOCKUPDATE(&time, &newtime); } - - softclock(frame); + + setsoftclock(); } void diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index ed85804..87ac79c 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.48 1998/01/07 12:29:17 phk Exp $ + * $Id: kern_clock.c,v 1.49 1998/01/10 13:16:19 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -628,8 +628,8 @@ hardclock(frame) } CPU_CLOCKUPDATE(&time, &newtime); } - - softclock(frame); + + setsoftclock(); } void diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index c79b3ab..a3c4462 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.48 1998/01/07 12:29:17 phk Exp $ + * $Id: kern_timeout.c,v 1.49 1998/01/10 13:16:26 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -108,8 +108,7 @@ static struct callout *nextsoftcheck; /* Next callout to be checked. */ /*ARGSUSED*/ void -softclock(frame) - struct clockframe *frame; +softclock() { register struct callout *c; register struct callout_tailq *bucket; @@ -124,11 +123,6 @@ softclock(frame) softticks++; return; } - if (!CLKF_BASEPRI(frame)) { - /* Not yet, come back later */ - setsoftclock(); - return; - } (void)splsoftclock(); |
