1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00

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

vendor branch. No functional change.

MFC after:	1 week
This commit is contained in:
Mark Johnston 2015-02-03 05:38:52 +00:00
parent 04c5a27be0
commit ac21b651bf
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=278136

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