diff options
author | jhb <jhb@FreeBSD.org> | 2001-02-09 17:46:35 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2001-02-09 17:46:35 +0000 |
commit | b30904d8405e0fc49c1043759a015628e89a2a2c (patch) | |
tree | d044a3ac558b84ef586376cd72c3d4f76db77509 /sys/kern | |
parent | 1b1c815619bd7dd106cc79a9144b32c38284b829 (diff) | |
download | FreeBSD-src-b30904d8405e0fc49c1043759a015628e89a2a2c.zip FreeBSD-src-b30904d8405e0fc49c1043759a015628e89a2a2c.tar.gz |
- Catch up to the new swi API changes:
- Use swi_* function names.
- Use void * to hold cookies to handlers instead of struct intrhand *.
- In sio.c, use 'driver_name' instead of "sio" as the name of the driver
lock to minimize diffs with cy(4).
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/kern_clock.c | 4 | ||||
-rw-r--r-- | sys/kern/subr_taskqueue.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 0743c6c..fb4b4a6 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -209,11 +209,11 @@ hardclock(frame) mtx_unlock_spin(&callout_lock); /* - * sched_swi acquires sched_lock, so we don't want to call it with + * swi_sched acquires sched_lock, so we don't want to call it with * callout_lock held; incorrect locking order. */ if (need_softclock) - sched_swi(softclock_ih, SWI_NOSWITCH); + swi_sched(softclock_ih, SWI_NOSWITCH); } /* diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c index 5afda76..30d834a 100644 --- a/sys/kern/subr_taskqueue.c +++ b/sys/kern/subr_taskqueue.c @@ -40,7 +40,7 @@ static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues"); static STAILQ_HEAD(taskqueue_list, taskqueue) taskqueue_queues; -static struct intrhand *taskqueue_ih; +static void *taskqueue_ih; struct taskqueue { STAILQ_ENTRY(taskqueue) tq_link; @@ -193,7 +193,7 @@ taskqueue_run(struct taskqueue *queue) static void taskqueue_swi_enqueue(void *context) { - sched_swi(taskqueue_ih, SWI_NOSWITCH); + swi_sched(taskqueue_ih, SWI_NOSWITCH); } static void @@ -203,5 +203,5 @@ taskqueue_swi_run(void *dummy) } TASKQUEUE_DEFINE(swi, taskqueue_swi_enqueue, 0, - taskqueue_ih = sinthand_add("task queue", NULL, - taskqueue_swi_run, NULL, SWI_TQ, 0)); + swi_add(NULL, "task queue", taskqueue_swi_run, NULL, SWI_TQ, 0, + &taskqueue_ih)); |