d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Diff reduction with illumos, in preparation for merging r266993 from the

Browse Source 
vendor branch. No functional change.

MFC after:	1 week
This commit is contained in:
markj 2015-02-03 05:38:52 +00:00
parent 64de42a598
commit c436419aea
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
View File

@ -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);
#ifndef illumos
kmem_free(state, 0);
#endif
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);
#endif
ASSERT(dtrace_opens > 0);
#ifdef illumos
/*
* Only relinquish control of the kernel debugger interface when there