diff options
author | markj <markj@FreeBSD.org> | 2013-07-05 22:42:10 +0000 |
---|---|---|
committer | markj <markj@FreeBSD.org> | 2013-07-05 22:42:10 +0000 |
commit | d2dc734eabdb9ec71d1903ccfd68dd81a96709a6 (patch) | |
tree | bb89f8a576143a2f571eaad951ee16cac7c429f4 /sys/cddl/dev/dtrace | |
parent | 044747c27f806f075ae58e3a13ad2423d5fdeeb3 (diff) | |
download | FreeBSD-src-d2dc734eabdb9ec71d1903ccfd68dd81a96709a6.zip FreeBSD-src-d2dc734eabdb9ec71d1903ccfd68dd81a96709a6.tar.gz |
Hide references to mod_lock. In FreeBSD it is always acquired with the
provider lock held, so its use has no effect.
Diffstat (limited to 'sys/cddl/dev/dtrace')
-rw-r--r-- | sys/cddl/dev/dtrace/dtrace_ioctl.c | 8 | ||||
-rw-r--r-- | sys/cddl/dev/dtrace/dtrace_load.c | 6 | ||||
-rw-r--r-- | sys/cddl/dev/dtrace/dtrace_unload.c | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sys/cddl/dev/dtrace/dtrace_ioctl.c b/sys/cddl/dev/dtrace/dtrace_ioctl.c index bb03ffd..87da9a7 100644 --- a/sys/cddl/dev/dtrace/dtrace_ioctl.c +++ b/sys/cddl/dev/dtrace/dtrace_ioctl.c @@ -580,19 +580,25 @@ dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, return (EINVAL); mutex_enter(&dtrace_provider_lock); +#if defined(sun) mutex_enter(&mod_lock); +#endif mutex_enter(&dtrace_lock); if (desc->dtargd_id > dtrace_nprobes) { mutex_exit(&dtrace_lock); +#if defined(sun) mutex_exit(&mod_lock); +#endif mutex_exit(&dtrace_provider_lock); return (EINVAL); } if ((probe = dtrace_probes[desc->dtargd_id - 1]) == NULL) { mutex_exit(&dtrace_lock); +#if defined(sun) mutex_exit(&mod_lock); +#endif mutex_exit(&dtrace_provider_lock); return (EINVAL); } @@ -616,7 +622,9 @@ dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, probe->dtpr_id, probe->dtpr_arg, desc); } +#if defined(sun) mutex_exit(&mod_lock); +#endif mutex_exit(&dtrace_provider_lock); return (0); diff --git a/sys/cddl/dev/dtrace/dtrace_load.c b/sys/cddl/dev/dtrace/dtrace_load.c index 5926725..672945c 100644 --- a/sys/cddl/dev/dtrace/dtrace_load.c +++ b/sys/cddl/dev/dtrace/dtrace_load.c @@ -57,12 +57,6 @@ dtrace_load(void *dummy) dtrace_invop_init(); /* - * XXX This is a short term hack to avoid having to comment - * out lots and lots of lock/unlock calls. - */ - mutex_init(&mod_lock,"XXX mod_lock hack", MUTEX_DEFAULT, NULL); - - /* * Initialise the mutexes without 'witness' because the dtrace * code is mostly written to wait for memory. To have the * witness code change a malloc() from M_WAITOK to M_NOWAIT diff --git a/sys/cddl/dev/dtrace/dtrace_unload.c b/sys/cddl/dev/dtrace/dtrace_unload.c index 247cbb1..2ebb52d 100644 --- a/sys/cddl/dev/dtrace/dtrace_unload.c +++ b/sys/cddl/dev/dtrace/dtrace_unload.c @@ -123,9 +123,6 @@ dtrace_unload() mutex_destroy(&dtrace_lock); mutex_destroy(&dtrace_errlock); - /* XXX Hack */ - mutex_destroy(&mod_lock); - /* Reset our hook for exceptions. */ dtrace_invop_uninit(); |