From owner-svn-src-all@FreeBSD.ORG  Sun Dec 27 22:49:34 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 693571065672;
	Sun, 27 Dec 2009 22:49:34 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 58CE88FC19;
	Sun, 27 Dec 2009 22:49:34 +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 nBRMnYRe069961;
	Sun, 27 Dec 2009 22:49:34 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBRMnYAf069958;
	Sun, 27 Dec 2009 22:49:34 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <200912272249.nBRMnYAf069958@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Sun, 27 Dec 2009 22:49:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201067 - in stable/8/sys: dev/ips kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Dec 2009 22:49:34 -0000

Author: mjacob
Date: Sun Dec 27 22:49:34 2009
New Revision: 201067
URL: http://svn.freebsd.org/changeset/base/201067

Log:
  MFC 200620,200621: fix argument order to mtx_init call.

Modified:
  stable/8/sys/dev/ips/ips_pci.c
  stable/8/sys/kern/uipc_syscalls.c

Modified: stable/8/sys/dev/ips/ips_pci.c
==============================================================================
--- stable/8/sys/dev/ips/ips_pci.c	Sun Dec 27 22:42:47 2009	(r201066)
+++ stable/8/sys/dev/ips/ips_pci.c	Sun Dec 27 22:49:34 2009	(r201067)
@@ -154,7 +154,7 @@ static int ips_pci_attach(device_t dev)
         }
 	sc->ips_ich.ich_func = ips_intrhook;
 	sc->ips_ich.ich_arg = sc;
-	mtx_init(&sc->queue_mtx, "IPS bioqueue lock", MTX_DEF, 0);
+	mtx_init(&sc->queue_mtx, "IPS bioqueue lock", NULL, MTX_DEF);
 	sema_init(&sc->cmd_sema, 0, "IPS Command Semaphore");
 	bioq_init(&sc->queue);
 	if (config_intrhook_establish(&sc->ips_ich) != 0) {

Modified: stable/8/sys/kern/uipc_syscalls.c
==============================================================================
--- stable/8/sys/kern/uipc_syscalls.c	Sun Dec 27 22:42:47 2009	(r201066)
+++ stable/8/sys/kern/uipc_syscalls.c	Sun Dec 27 22:49:34 2009	(r201067)
@@ -1886,7 +1886,7 @@ kern_sendfile(struct thread *td, struct 
 	if (uap->flags & SF_SYNC) {
 		sfs = malloc(sizeof *sfs, M_TEMP, M_WAITOK);
 		memset(sfs, 0, sizeof *sfs);
-		mtx_init(&sfs->mtx, "sendfile", MTX_DEF, 0);
+		mtx_init(&sfs->mtx, "sendfile", NULL, MTX_DEF);
 		cv_init(&sfs->cv, "sendfile");
 	}