diff options
| author | Thomas Nordin <nordin@cvs.openbsd.org> | 2002-06-07 08:16:27 +0000 |
|---|---|---|
| committer | Thomas Nordin <nordin@cvs.openbsd.org> | 2002-06-07 08:16:27 +0000 |
| commit | 67b3aeb78eebce898b1a57a63f52db08a521dbaf (patch) | |
| tree | d77c12fb0fd215e54e8877bec62395cbf40a7dd9 | |
| parent | 4bf75b6d6c17e54fa6b28540e645bdd8cfecf4b5 (diff) | |
Simplify so that we can remove CLKF_BASEPRI() and spllowersoftclock()
infrastructure. ok art@ and miod@
| -rw-r--r-- | sys/kern/kern_clock.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index d87811e5c26..847e6352f0e 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_clock.c,v 1.35 2002/04/24 21:53:12 espie Exp $ */ +/* $OpenBSD: kern_clock.c,v 1.36 2002/06/07 08:16:26 nordin Exp $ */ /* $NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $ */ /*- @@ -691,20 +691,11 @@ hardclock(frame) * relatively high clock interrupt priority any longer than necessary. */ if (timeout_hardclock_update()) { - if (CLKF_BASEPRI(frame)) { - /* - * Save the overhead of a software interrupt; - * it will happen as soon as we return, so do it now. - */ - spllowersoftclock(); - softclock(); - } else { #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS - softintr_schedule(softclock_si); + softintr_schedule(softclock_si); #else - setsoftclock(); + setsoftclock(); #endif - } } } |