From owner-p4-projects@FreeBSD.ORG  Fri Jul  4 09:21:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8F6F41065673; Fri,  4 Jul 2008 09:21:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 52A8C106566C
	for <perforce@FreeBSD.org>; Fri,  4 Jul 2008 09:21:19 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 257D28FC1C
	for <perforce@FreeBSD.org>; Fri,  4 Jul 2008 09:21:19 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m649LJ0i077137
	for <perforce@FreeBSD.org>; Fri, 4 Jul 2008 09:21:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m649LIeu077135
	for perforce@freebsd.org; Fri, 4 Jul 2008 09:21:18 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 4 Jul 2008 09:21:18 GMT
Message-Id: <200807040921.m649LIeu077135@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 144605 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: Fri, 04 Jul 2008 09:21:19 -0000

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

Change 144605 by hselasky@hselasky_laptop001 on 2008/07/04 09:21:14

	
	Fix a witness issue with Giant.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#6 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#6 (text+ko) ====

@@ -289,7 +289,9 @@
 	}
 	if (mtx) {
 		mtx_unlock(mtx);
-		mtx_assert(mtx, MA_NOTOWNED);
+		if (mtx != &Giant) {
+			mtx_assert(mtx, MA_NOTOWNED);
+		}
 	}
 	/*
 	 * Grab the default sx-lock so that serialisation