summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1998-01-10 14:55:14 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1998-01-10 14:55:14 +0000
commiteeb355f73f5aee8f8870fd2864ae7eff9f86a8b0 (patch)
tree1773c3b39d4fbec21c7a4e0c3dcc1a696ed9211b
parent821b78a3f9d97f28e15357299285d6ceba1c9a6e (diff)
Notes
-rw-r--r--sys/kern/kern_clock.c6
-rw-r--r--sys/kern/kern_tc.c6
-rw-r--r--sys/kern/kern_timeout.c10
3 files changed, 8 insertions, 14 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index ed85804b637a..87ac79c61b08 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 ed85804b637a..87ac79c61b08 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 c79b3ab1d339..a3c4462d16c6 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();