Module Name: src
Committed By: uebayasi
Date: Tue Aug 2 05:17:18 UTC 2011
Modified Files:
src/sys/arch/mac68k/obio: esp.c
Log Message:
ncr53c9x was converted to use mutex(9), follow that. Fix DEBUG build too.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/mac68k/obio/esp.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/arch/mac68k/obio/esp.c
diff -u src/sys/arch/mac68k/obio/esp.c:1.53 src/sys/arch/mac68k/obio/esp.c:1.54
--- src/sys/arch/mac68k/obio/esp.c:1.53 Tue Aug 2 05:10:31 2011
+++ src/sys/arch/mac68k/obio/esp.c Tue Aug 2 05:17:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.53 2011/08/02 05:10:31 uebayasi Exp $ */
+/* $NetBSD: esp.c,v 1.54 2011/08/02 05:17:18 uebayasi Exp $ */
/*
* Copyright (c) 1997 Jason R. Thorpe.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.53 2011/08/02 05:10:31 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.54 2011/08/02 05:17:18 uebayasi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -89,7 +89,7 @@
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/queue.h>
-#include <sys/simplelock.h>
+#include <sys/mutex.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
@@ -871,9 +871,9 @@
* which protects itself against multiple invocation with a
* simple_lock. Follow the example of ncr53c9x_poll().
*/
- simple_unlock(&sc->sc_lock);
+ mutex_exit(&sc->sc_lock);
ncr53c9x_intr(sc);
- simple_lock(&sc->sc_lock);
+ mutex_enter(&sc->sc_lock);
if (espspl != -1)
splx(espspl);
espspl = -1;
