From owner-p4-projects@FreeBSD.ORG  Sun Apr 22 07:02:28 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4A5F016A408; Sun, 22 Apr 2007 07:02:28 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0BBA716A404
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 07:02:28 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id EFF4013C465
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 07:02:27 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3M72RWY040995
	for <perforce@freebsd.org>; Sun, 22 Apr 2007 07:02:27 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3M72RP3040991
	for perforce@freebsd.org; Sun, 22 Apr 2007 07:02:27 GMT
	(envelope-from mjacob@freebsd.org)
Date: Sun, 22 Apr 2007 07:02:27 GMT
Message-Id: <200704220702.l3M72RP3040991@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 118566 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Apr 2007 07:02:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=118566

Change 118566 by mjacob@mjexp on 2007/04/22 07:01:29

	Missed a hanging chad from previous rip out of older locking.

Affected files ...

.. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#19 edit

Differences ...

==== //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#19 (text+ko) ====

@@ -3517,13 +3517,8 @@
 		isp->isp_osinfo.mbox_sleep_ok = 0;
 		isp->isp_osinfo.mbox_sleeping = 1;
 		for (olim = 0; olim < max; olim++) {
-#if __FreeBSD_version < 500000  || !defined(ISP_SMPLOCK)
 			tsleep(&isp->isp_mbxworkp, PRIBIO, "ispmbx_sleep",
 			    isp_mstohz(ms));
-#else
-			msleep(&isp->isp_mbxworkp, &isp->isp_mtx, PRIBIO,
-			    "ispmbx_sleep", isp_mstohz(ms));
-#endif
 			if (isp->isp_osinfo.mboxcmd_done) {
 				break;
 			}