[src/netbsd-1-5]: src/sys/dev/raidframe Pullup 1.9 [oster]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/894f4bea91f4
branches:  netbsd-1-5
changeset: 489819:894f4bea91f4
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Oct 17 20:15:21 2000 +0000

description:
Pullup 1.9 [oster]:
convert tsleep()->ltsleep(), which makes the kernel complain less
when compiled with LOCKDEBUG.

diffstat:

 sys/dev/raidframe/rf_revent.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 64bf06135522 -r 894f4bea91f4 sys/dev/raidframe/rf_revent.c
--- a/sys/dev/raidframe/rf_revent.c     Tue Oct 17 20:15:11 2000 +0000
+++ b/sys/dev/raidframe/rf_revent.c     Tue Oct 17 20:15:21 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_revent.c,v 1.7.2.1 2000/10/17 20:01:14 tv Exp $     */
+/*     $NetBSD: rf_revent.c,v 1.7.2.2 2000/10/17 20:15:21 tv Exp $     */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -50,7 +50,8 @@
 #include <sys/kernel.h>
 
 #define DO_WAIT(_rc)  \
-       tsleep(&(_rc)->eventQueue, PRIBIO,  "raidframe eventq", 0)
+       ltsleep(&(_rc)->eventQueue, PRIBIO,  "raidframe eventq", \
+               0, &((_rc)->eq_mutex))
 
 #define DO_SIGNAL(_rc)     wakeup(&(_rc)->eventQueue)
 
@@ -141,8 +142,10 @@
 #if RF_RECON_STATS > 0
                        reconDesc->numReconExecDelays++;
 #endif                         /* RF_RECON_STATS > 0 */
-                       status = tsleep(&reconDesc->reconExecTicks, 
-                                       PRIBIO, "recon delay", RECON_TIMO);
+
+                       status = ltsleep(&reconDesc->reconExecTicks, PRIBIO, 
+                                        "recon delay", RECON_TIMO,
+                                        &rctrl->eq_mutex);
                        RF_ASSERT(status == EWOULDBLOCK);
                        reconDesc->reconExecTicks = 0;
                }