diff options
| author | jeff <jeff@FreeBSD.org> | 2008-04-02 11:21:42 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2008-04-02 11:21:42 +0000 |
| commit | ca28ca664f6a4a399649d639f00a96bb8a8822b6 (patch) | |
| tree | f461eb90857918e685e5890301ea883b7c841906 /sys | |
| parent | b0655179358fbd6917b144860a6e1b180e5bc26b (diff) | |
| download | FreeBSD-src-ca28ca664f6a4a399649d639f00a96bb8a8822b6.zip FreeBSD-src-ca28ca664f6a4a399649d639f00a96bb8a8822b6.tar.gz | |
- Convert two timeout users to the new callout_reset_curcpu() api.
Sponsored by: Nokia
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_event.c | 6 | ||||
| -rw-r--r-- | 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 cfdb9b1..d17a20d 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 bc3f1d8..9edd56e 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); } /* |
