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 <tak.swd at gmail.com>
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);
}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
