svn commit: r262054 - stable/10/sys/cddl/dev/dtrace

[Andriy Gapon]

Author: avg
Date: Mon Feb 17 13:36:35 2014
New Revision: 262054
URL: http://svnweb.freebsd.org/changeset/base/262054

Log:
  MFC r260132: Allocate the probe ID unrhdr before the DTrace kld_* event
  handlers are registered

Modified:
  stable/10/sys/cddl/dev/dtrace/dtrace_load.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/dev/dtrace/dtrace_load.c
==============================================================================
--- stable/10/sys/cddl/dev/dtrace/dtrace_load.c	Mon Feb 17 13:33:42 2014	(r262053)
+++ stable/10/sys/cddl/dev/dtrace/dtrace_load.c	Mon Feb 17 13:36:35 2014	(r262054)
@@ -58,6 +58,8 @@ dtrace_load(void *dummy)
 
 	dtrace_taskq = taskq_create("dtrace_taskq", 1, maxclsyspri, 0, 0, 0);
 
+	dtrace_arena = new_unrhdr(1, INT_MAX, &dtrace_unr_mtx);
+
 	/* Register callbacks for linker file load and unload events. */
 	dtrace_kld_load_tag = EVENTHANDLER_REGISTER(kld_load,
 	    dtrace_kld_load, NULL, EVENTHANDLER_PRI_ANY);
@@ -85,8 +87,6 @@ dtrace_load(void *dummy)
 
 	ASSERT(MUTEX_HELD(&cpu_lock));
 
-	dtrace_arena = new_unrhdr(1, INT_MAX, &dtrace_unr_mtx);
-
 	dtrace_state_cache = kmem_cache_create("dtrace_state_cache",
 	    sizeof (dtrace_dstate_percpu_t) * NCPU, DTRACE_STATE_ALIGN,
 	    NULL, NULL, NULL, NULL, NULL, 0);