diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_clock.c | 26 | ||||
| -rw-r--r-- | sys/kern/kern_sig.c | 9 | ||||
| -rw-r--r-- | sys/kern/kern_timeout.c | 5 |
3 files changed, 7 insertions, 33 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 7e8f0dd3b9c..48ee37f7de1 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_clock.c,v 1.68 2009/01/21 21:02:39 miod Exp $ */ +/* $OpenBSD: kern_clock.c,v 1.69 2009/11/04 19:14:10 kettenis Exp $ */ /* $NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $ */ /*- @@ -120,20 +120,7 @@ volatile struct timeval time volatile struct timeval mono_time; #endif -#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS void *softclock_si; -void generic_softclock(void *); - -void -generic_softclock(void *ignore) -{ - /* - * XXX - don't commit, just a dummy wrapper until we learn everyone - * deal with a changed proto for softclock(). - */ - softclock(); -} -#endif /* * Initialize clock frequencies and start both clocks running. @@ -146,11 +133,9 @@ initclocks(void) extern void inittimecounter(void); #endif -#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS - softclock_si = softintr_establish(IPL_SOFTCLOCK, generic_softclock, NULL); + softclock_si = softintr_establish(IPL_SOFTCLOCK, softclock, NULL); if (softclock_si == NULL) panic("initclocks: unable to register softclock intr"); -#endif /* * Set divisors to 1 (normal case) and let the machine-specific @@ -323,13 +308,8 @@ hardclock(struct clockframe *frame) * Process callouts at a very low cpu priority, so we don't keep the * relatively high clock interrupt priority any longer than necessary. */ - if (timeout_hardclock_update()) { -#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS + if (timeout_hardclock_update()) softintr_schedule(softclock_si); -#else - setsoftclock(); -#endif - } } /* diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index b6967c58926..29d7d4344ba 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sig.c,v 1.105 2009/06/06 21:25:19 deraadt Exp $ */ +/* $OpenBSD: kern_sig.c,v 1.106 2009/11/04 19:14:10 kettenis Exp $ */ /* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */ /* @@ -1203,9 +1203,8 @@ keep: void proc_stop(struct proc *p, int sw) { -#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS extern void *softclock_si; -#endif + #ifdef MULTIPROCESSOR SCHED_ASSERT_LOCKED(); #endif @@ -1219,11 +1218,7 @@ proc_stop(struct proc *p, int sw) * We need this soft interrupt to be handled fast. * Extra calls to softclock don't hurt. */ -#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS softintr_schedule(softclock_si); -#else - setsoftclock(); -#endif } if (sw) mi_switch(); diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index be87d0fc789..90b3f08e1ed 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_timeout.c,v 1.31 2009/06/02 22:05:54 guenther Exp $ */ +/* $OpenBSD: kern_timeout.c,v 1.32 2009/11/04 19:14:10 kettenis Exp $ */ /* * Copyright (c) 2001 Thomas Nordin <nordin@openbsd.org> * Copyright (c) 2000-2001 Artur Grabowski <art@openbsd.org> @@ -304,11 +304,10 @@ timeout_hardclock_update(void) } void -softclock(void) +softclock(void *arg) { struct timeout *to; void (*fn)(void *); - void *arg; mtx_enter(&timeout_mutex); while (!CIRCQ_EMPTY(&timeout_todo)) { |