From owner-svn-src-head@FreeBSD.ORG  Sat Jun  5 00:55:22 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84AC4106566C;
	Sat,  5 Jun 2010 00:55:22 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7572F8FC0A;
	Sat,  5 Jun 2010 00:55:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o550tMR0064800;
	Sat, 5 Jun 2010 00:55:22 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o550tMuA064798;
	Sat, 5 Jun 2010 00:55:22 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201006050055.o550tMuA064798@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Sat, 5 Jun 2010 00:55:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208808 - head/sys/dev/isp
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Jun 2010 00:55:22 -0000

Author: mjacob
Date: Sat Jun  5 00:55:21 2010
New Revision: 208808
URL: http://svn.freebsd.org/changeset/base/208808

Log:
  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.
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/isp/isp_freebsd.c

Modified: head/sys/dev/isp/isp_freebsd.c
==============================================================================
--- head/sys/dev/isp/isp_freebsd.c	Fri Jun  4 17:54:30 2010	(r208807)
+++ head/sys/dev/isp/isp_freebsd.c	Sat Jun  5 00:55:21 2010	(r208808)
@@ -4139,7 +4139,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);