From e8245292a79d57e4d65ce6a1ff236be2b31774e4 Mon Sep 17 00:00:00 2001 From: Jeff Roberson Date: Wed, 2 Apr 2008 11:21:42 +0000 Subject: [PATCH] - Convert two timeout users to the new callout_reset_curcpu() api. Sponsored by: Nokia --- sys/kern/kern_event.c | 6 +++--- sys/kern/subr_sleepqueue.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index cfdb9b1b4c2..d17a20d0ed2 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -454,7 +454,7 @@ filt_timerexpire(void *knx) if ((kn->kn_flags & EV_ONESHOT) != EV_ONESHOT) { calloutp = (struct callout *)kn->kn_hook; - callout_reset(calloutp, timertoticks(kn->kn_sdata), + callout_reset_curcpu(calloutp, timertoticks(kn->kn_sdata), filt_timerexpire, kn); } } @@ -481,8 +481,8 @@ filt_timerattach(struct knote *kn) M_KQUEUE, M_WAITOK); callout_init(calloutp, CALLOUT_MPSAFE); kn->kn_hook = calloutp; - callout_reset(calloutp, timertoticks(kn->kn_sdata), filt_timerexpire, - kn); + callout_reset_curcpu(calloutp, timertoticks(kn->kn_sdata), + filt_timerexpire, kn); return (0); } diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c index bc3f1d80590..9edd56e61ac 100644 --- a/sys/kern/subr_sleepqueue.c +++ b/sys/kern/subr_sleepqueue.c @@ -361,7 +361,7 @@ sleepq_set_timeout(void *wchan, int timo) MPASS(TD_ON_SLEEPQ(td)); MPASS(td->td_sleepqueue == NULL); MPASS(wchan != NULL); - callout_reset(&td->td_slpcallout, timo, sleepq_timeout, td); + callout_reset_curcpu(&td->td_slpcallout, timo, sleepq_timeout, td); } /*