svn commit: r209322 - stable/8/sys/dev/isp

[Matt Jacob]

Author: mjacob
Date: Sat Jun 19 00:37:14 2010
New Revision: 209322
URL: http://svn.freebsd.org/changeset/base/209322

Log:
  This is an MFC of 208808
  
  I was getting panics in sleepq_add for the second sleep in isp_kthread.
  I don't know why- but it occurred to me in looking at the second sleep
  is that all I want is a pause- not an actual sleep. So do that instead.

Modified:
  stable/8/sys/dev/isp/isp_freebsd.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/ixgbe/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/8/sys/dev/isp/isp_freebsd.c	Fri Jun 18 23:14:16 2010	(r209321)
+++ stable/8/sys/dev/isp/isp_freebsd.c	Sat Jun 19 00:37:14 2010	(r209322)
@@ -4135,7 +4135,9 @@ isp_kthread(void *arg)
 		 */
 		if (slp == 0 && fc->hysteresis) {
 			isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "%s: Chan %d sleep hysteresis ticks %d", __func__, chan, fc->hysteresis * hz);
-			(void) msleep(&isp_fabric_hysteresis, &isp->isp_osinfo.lock, PRIBIO, "ispT", (fc->hysteresis * hz));
+			mtx_unlock(&isp->isp_osinfo.lock);
+			pause("ispt", fc->hysteresis * hz);
+			mtx_lock(&isp->isp_osinfo.lock);
 		}
 	}
 	mtx_unlock(&isp->isp_osinfo.lock);