From owner-p4-projects@FreeBSD.ORG  Sun Mar  5 18:18:37 2006
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 61C2A16A4A1; Sun,  5 Mar 2006 18:18:36 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8EE1916A454
	for <perforce@freebsd.org>; Sun,  5 Mar 2006 18:18:35 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 34C6443D55
	for <perforce@freebsd.org>; Sun,  5 Mar 2006 18:18:35 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k25IIZRU073929
	for <perforce@freebsd.org>; Sun, 5 Mar 2006 18:18:35 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k25IIY1p073923
	for perforce@freebsd.org; Sun, 5 Mar 2006 18:18:34 GMT
	(envelope-from scottl@freebsd.org)
Date: Sun, 5 Mar 2006 18:18:34 GMT
Message-Id: <200603051818.k25IIY1p073923@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92801 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, 05 Mar 2006 18:18:37 -0000

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

Change 92801 by scottl@scottl-x64 on 2006/03/05 18:17:58

	Fix compile problems.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#7 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#7 (text+ko) ====

@@ -412,7 +412,6 @@
 void
 cam_periph_invalidate(struct cam_periph *periph)
 {
-	int s;
 
 	/*
 	 * We only call this routine the first time a peripheral is
@@ -444,7 +443,7 @@
 {
 	struct periph_driver **p_drv;
 
-	mtx_assert(&cam_topo_lock, MTX_OWNED);
+	mtx_assert(&cam_topo_lock, MA_OWNED);
 
 	for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) {
 		if (strcmp((*p_drv)->driver_name, periph->periph_name) == 0) {