diff options
| author | markj <markj@FreeBSD.org> | 2015-02-03 05:38:52 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2015-02-03 05:38:52 +0000 |
| commit | c436419aea65316658f955ab339fb1d6446b04fb (patch) | |
| tree | 3ecdce742709665f87e7cb7d99ece8708a1df773 /sys/cddl/contrib/opensolaris/uts/common/dtrace | |
| parent | 64de42a59821b92221387b40f2644959dac94df6 (diff) | |
| download | FreeBSD-src-c436419aea65316658f955ab339fb1d6446b04fb.zip FreeBSD-src-c436419aea65316658f955ab339fb1d6446b04fb.tar.gz | |
Diff reduction with illumos, in preparation for merging r266993 from the
vendor branch. No functional change.
MFC after: 1 week
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/dtrace')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index f5a5b63..4251366 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -16841,23 +16841,20 @@ dtrace_dtr(void *data) mutex_enter(&cpu_lock); mutex_enter(&dtrace_lock); - if (state != NULL) { - if (state->dts_anon) { - /* - * There is anonymous state. Destroy that first. - */ - ASSERT(dtrace_anon.dta_state == NULL); - dtrace_state_destroy(state->dts_anon); - } - - dtrace_state_destroy(state); + if (state->dts_anon) { + /* + * There is anonymous state. Destroy that first. + */ + ASSERT(dtrace_anon.dta_state == NULL); + dtrace_state_destroy(state->dts_anon); + } + dtrace_state_destroy(state); #ifndef illumos - kmem_free(state, 0); + kmem_free(state, 0); #endif - } - ASSERT(dtrace_opens > 0); + #ifdef illumos /* * Only relinquish control of the kernel debugger interface when there |
