- 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).

1 files changed, 4 insertions, 4 deletions

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));