CVS commit: src/sys/dev/dmover

[Jonathan A. Kollasch]

Module Name:    src
Committed By:   jakllsch
Date:           Sat May 14 14:49:19 UTC 2011

Modified Files:
        src/sys/dev/dmover: dmover_process.c

Log Message:
Convert simplelock to mutex in this portion of dmover(4).


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/dmover/dmover_process.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/dmover/dmover_process.c
diff -u src/sys/dev/dmover/dmover_process.c:1.4 src/sys/dev/dmover/dmover_process.c:1.5
--- src/sys/dev/dmover/dmover_process.c:1.4	Sat Jan  5 02:47:03 2008
+++ src/sys/dev/dmover/dmover_process.c	Sat May 14 14:49:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: dmover_process.c,v 1.4 2008/01/05 02:47:03 matt Exp $	*/
+/*	$NetBSD: dmover_process.c,v 1.5 2011/05/14 14:49:19 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,18 +40,18 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_process.c,v 1.4 2008/01/05 02:47:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_process.c,v 1.5 2011/05/14 14:49:19 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/intr.h>
-#include <sys/simplelock.h>
+#include <sys/mutex.h>
 
 #include <dev/dmover/dmovervar.h>
 
 TAILQ_HEAD(, dmover_request) dmover_completed_q;
-struct simplelock dmover_completed_q_slock;	/* must be held at splbio */
+kmutex_t dmover_completed_q_lock;
 
 void	*dmover_completed_si;
 
@@ -67,7 +67,7 @@
 {
 
 	TAILQ_INIT(&dmover_completed_q);
-	simple_lock_init(&dmover_completed_q_slock);
+	mutex_init(&dmover_completed_q_lock, MUTEX_DEFAULT, IPL_BIO);
 
 	dmover_completed_si = softint_establish(SOFTINT_CLOCK,
 	    dmover_complete, NULL);
@@ -150,9 +150,9 @@
 	dreq->dreq_assignment = NULL;
 
 	if (dreq->dreq_callback != NULL) {
-		simple_lock(&dmover_completed_q_slock);
+		mutex_enter(&dmover_completed_q_lock);
 		TAILQ_INSERT_TAIL(&dmover_completed_q, dreq, dreq_dmbq);
-		simple_unlock(&dmover_completed_q_slock);
+		mutex_exit(&dmover_completed_q_lock);
 		softint_schedule(dmover_completed_si);
 	} else if (dreq->dreq_flags & DMOVER_REQ_WAIT)
 		wakeup(dreq);
@@ -169,15 +169,12 @@
 dmover_complete(void *arg)
 {
 	struct dmover_request *dreq;
-	int s;
 
 	for (;;) {
-		s = splbio();
-		simple_lock(&dmover_completed_q_slock);
+		mutex_enter(&dmover_completed_q_lock);
 		if ((dreq = TAILQ_FIRST(&dmover_completed_q)) != NULL)
 			TAILQ_REMOVE(&dmover_completed_q, dreq, dreq_dmbq);
-		simple_unlock(&dmover_completed_q_slock);
-		splx(s);
+		mutex_exit(&dmover_completed_q_lock);
 
 		if (dreq == NULL)
 			return;