diff options
Diffstat (limited to 'sys/kern/kern_clock.c')
| -rw-r--r-- | sys/kern/kern_clock.c | 26 |
1 files changed, 3 insertions, 23 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 - } } /* |