diff options
| author | jhb <jhb@FreeBSD.org> | 2002-04-04 21:03:38 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2002-04-04 21:03:38 +0000 |
| commit | db9aa81e239bb1c46b3b7ba560474cd954b78bf3 (patch) | |
| tree | f7344c6a10fdc020dd02fe2ee1f244cb56f92bb6 /sys/pc98 | |
| parent | 5b964d2945fa9a17daef9bc1e6dbbcb4f7154379 (diff) | |
| download | FreeBSD-src-db9aa81e239bb1c46b3b7ba560474cd954b78bf3.zip FreeBSD-src-db9aa81e239bb1c46b3b7ba560474cd954b78bf3.tar.gz | |
Change callers of mtx_init() to pass in an appropriate lock type name. In
most cases NULL is passed, but in some cases such as network driver locks
(which use the MTX_NETWORK_LOCK macro) and UMA zone locks, a name is used.
Tested on: i386, alpha, sparc64
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/sio.c | 3 | ||||
| -rw-r--r-- | sys/pc98/i386/machdep.c | 4 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 4 | ||||
| -rw-r--r-- | sys/pc98/pc98/sio.c | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 375527a..1369591 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -896,7 +896,8 @@ sioprobe(dev, xrid, rclk, noprobe) while (sio_inited != 2) if (atomic_cmpset_int(&sio_inited, 0, 1)) { - mtx_init(&sio_lock, sio_driver_name, (comconsole != -1) ? + mtx_init(&sio_lock, sio_driver_name, NULL, + (comconsole != -1) ? MTX_SPIN | MTX_QUIET : MTX_SPIN); atomic_store_rel_int(&sio_inited, 2); } diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 6b7abe1..746798a 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -1768,8 +1768,8 @@ init386(first) * under witness. */ mutex_init(); - mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); - mtx_init(&icu_lock, "icu", MTX_SPIN | MTX_NOWITNESS); + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_RECURSE); + mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS); /* make ldt memory segments */ /* diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 6b7abe1..746798a 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -1768,8 +1768,8 @@ init386(first) * under witness. */ mutex_init(); - mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); - mtx_init(&icu_lock, "icu", MTX_SPIN | MTX_NOWITNESS); + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_RECURSE); + mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS); /* make ldt memory segments */ /* diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index 375527a..1369591 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -896,7 +896,8 @@ sioprobe(dev, xrid, rclk, noprobe) while (sio_inited != 2) if (atomic_cmpset_int(&sio_inited, 0, 1)) { - mtx_init(&sio_lock, sio_driver_name, (comconsole != -1) ? + mtx_init(&sio_lock, sio_driver_name, NULL, + (comconsole != -1) ? MTX_SPIN | MTX_QUIET : MTX_SPIN); atomic_store_rel_int(&sio_inited, 2); } |
