From 2c2c366569949a5603feb14d43b09fc2be96756c Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Sat, 10 Jan 1998 14:55:14 +0000
Subject: Whoops.  softclock is called from doreti_swi as well.  Abandon call
 from hardclock().

Forgot this:

Pointed hat sent by:	bd
---
 sys/kern/kern_timeout.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'sys/kern/kern_timeout.c')

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();
 
-- 
cgit v1.1