diff --git a/sys/cddl/dev/dtrace/dtrace_load.c b/sys/cddl/dev/dtrace/dtrace_load.c
index 3ff12e0582d4..029af60d1cd8 100644
--- a/sys/cddl/dev/dtrace/dtrace_load.c
+++ b/sys/cddl/dev/dtrace/dtrace_load.c
@@ -97,11 +97,9 @@ dtrace_load(void *dummy)
 	mutex_init(&dtrace_errlock,"dtrace error lock", MUTEX_DEFAULT, NULL);
 #endif
 
+	mutex_enter(&cpu_lock);
 	mutex_enter(&dtrace_provider_lock);
 	mutex_enter(&dtrace_lock);
-	mutex_enter(&cpu_lock);
-
-	ASSERT(MUTEX_HELD(&cpu_lock));
 
 	dtrace_state_cache = kmem_cache_create("dtrace_state_cache",
 	    sizeof (dtrace_dstate_percpu_t) * NCPU, DTRACE_STATE_ALIGN,
@@ -151,13 +149,9 @@ dtrace_load(void *dummy)
 	dtrace_probeid_error = dtrace_probe_create((dtrace_provider_id_t)
 	    dtrace_provider, NULL, NULL, "ERROR", 1, NULL);
 
-	mutex_exit(&cpu_lock);
-
 	mutex_exit(&dtrace_lock);
 	mutex_exit(&dtrace_provider_lock);
 
-	mutex_enter(&cpu_lock);
-
 #ifdef EARLY_AP_STARTUP
 	CPU_FOREACH(i) {
 		(void) dtrace_cpu_setup(CPU_CONFIG, i);
@@ -173,6 +167,4 @@ dtrace_load(void *dummy)
 	    "dtrace/dtrace");
 	helper_dev = make_dev(&helper_cdevsw, 0, UID_ROOT, GID_WHEEL, 0660,
 	    "dtrace/helper");
-
-	return;
 }