diff options
| author | bmilekic <bmilekic@FreeBSD.org> | 2001-01-19 01:59:14 +0000 |
|---|---|---|
| committer | bmilekic <bmilekic@FreeBSD.org> | 2001-01-19 01:59:14 +0000 |
| commit | 37decc93f5a2dfb49438d1e77245218780583ef6 (patch) | |
| tree | 2e4b859fb1993ec2fe69e3e946d14a9fdc9cf441 /sys/pci/if_sk.c | |
| parent | 5977e97236d57a51dc2ddf0634bb4a69d30dc36f (diff) | |
| download | FreeBSD-src-37decc93f5a2dfb49438d1e77245218780583ef6.zip FreeBSD-src-37decc93f5a2dfb49438d1e77245218780583ef6.tar.gz | |
Implement MTX_RECURSE flag for mtx_init().
All calls to mtx_init() for mutexes that recurse must now include
the MTX_RECURSE bit in the flag argument variable. This change is in
preparation for an upcoming (further) mutex API cleanup.
The witness code will call panic() if a lock is found to recurse but
the MTX_RECURSE bit was not set during the lock's initialization.
The old MTX_RECURSE "state" bit (in mtx_lock) has been renamed to
MTX_RECURSED, which is more appropriate given its meaning.
The following locks have been made "recursive," thus far:
eventhandler, Giant, callout, sched_lock, possibly some others declared
in the architecture-specific code, all of the network card driver locks
in pci/, as well as some other locks in dev/ stuff that I've found to
be recursive.
Reviewed by: jhb
Diffstat (limited to 'sys/pci/if_sk.c')
| -rw-r--r-- | sys/pci/if_sk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c index 143c4e4..f09df99 100644 --- a/sys/pci/if_sk.c +++ b/sys/pci/if_sk.c @@ -1194,7 +1194,7 @@ static int sk_attach(dev) unit = device_get_unit(dev); bzero(sc, sizeof(struct sk_softc)); - mtx_init(&sc->sk_mtx, device_get_nameunit(dev), MTX_DEF); + mtx_init(&sc->sk_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); SK_LOCK(sc); /* |
