From owner-svn-src-all@FreeBSD.ORG Fri Feb 28 00:39:36 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57F0A965; Fri, 28 Feb 2014 00:39:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 28DD418D4; Fri, 28 Feb 2014 00:39:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1S0daG1074368; Fri, 28 Feb 2014 00:39:36 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1S0dZ0p074365; Fri, 28 Feb 2014 00:39:35 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201402280039.s1S0dZ0p074365@svn.freebsd.org> From: Christian Brueffer Date: Fri, 28 Feb 2014 00:39:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r262586 - in stable/10/sys: arm/broadcom/bcm2835 dev/nand powerpc/ofw X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 00:39:36 -0000 Author: brueffer Date: Fri Feb 28 00:39:35 2014 New Revision: 262586 URL: http://svnweb.freebsd.org/changeset/base/262586 Log: MFC: r261884 Correct the order of arguments to mtx_init(). PR: 186701 Submitted by: Takanori Sawada Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c stable/10/sys/dev/nand/nandbus.c stable/10/sys/powerpc/ofw/ofw_real.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c ============================================================================== --- stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c Fri Feb 28 00:26:57 2014 (r262585) +++ stable/10/sys/arm/broadcom/bcm2835/bcm2835_mbox.c Fri Feb 28 00:39:35 2014 (r262586) @@ -167,7 +167,7 @@ bcm_mbox_attach(device_t dev) return (ENXIO); } - mtx_init(&sc->lock, "vcio mbox", MTX_DEF, 0); + mtx_init(&sc->lock, "vcio mbox", NULL, MTX_DEF); for (i = 0; i < BCM2835_MBOX_CHANS; i++) { sc->valid[0] = 0; sc->msg[0] = 0; Modified: stable/10/sys/dev/nand/nandbus.c ============================================================================== --- stable/10/sys/dev/nand/nandbus.c Fri Feb 28 00:26:57 2014 (r262585) +++ stable/10/sys/dev/nand/nandbus.c Fri Feb 28 00:39:35 2014 (r262586) @@ -174,7 +174,7 @@ nandbus_attach(device_t dev) nfc = device_get_parent(dev); nfc_sc = device_get_softc(nfc); - mtx_init(&sc->nandbus_mtx, "nandbus lock", MTX_DEF, 0); + mtx_init(&sc->nandbus_mtx, "nandbus lock", NULL, MTX_DEF); cv_init(&sc->nandbus_cv, "nandbus cv"); /* Check each possible CS for existing nand devices */ Modified: stable/10/sys/powerpc/ofw/ofw_real.c ============================================================================== --- stable/10/sys/powerpc/ofw/ofw_real.c Fri Feb 28 00:26:57 2014 (r262585) +++ stable/10/sys/powerpc/ofw/ofw_real.c Fri Feb 28 00:39:35 2014 (r262586) @@ -300,7 +300,7 @@ ofw_real_init(ofw_t ofw, void *openfirm) { openfirmware = (int (*)(void *))openfirm; - mtx_init(&of_bounce_mtx, "OF Bounce Page", MTX_DEF, 0); + mtx_init(&of_bounce_mtx, "OF Bounce Page", NULL, MTX_DEF); of_bounce_virt = NULL; return (0); }