diff --git a/sys/cddl/dev/dtrace/dtrace_cddl.h b/sys/cddl/dev/dtrace/dtrace_cddl.h
--- a/sys/cddl/dev/dtrace/dtrace_cddl.h
+++ b/sys/cddl/dev/dtrace/dtrace_cddl.h
@@ -88,7 +88,7 @@
 	void		*td_systrace_args; /* syscall probe arguments. */
 	uint64_t	td_fasttrap_tp_gen; /* Tracepoint hash table gen. */
 	struct trapframe *td_dtrace_trapframe; /* Trap frame from invop. */
-	void		*td_kinst;
+	void		*td_kinst_tramp;
 } kdtrace_thread_t;
 
 /*
@@ -118,7 +118,7 @@
 #define	t_dtrace_systrace_args	td_dtrace->td_systrace_args
 #define	t_fasttrap_tp_gen	td_dtrace->td_fasttrap_tp_gen
 #define	t_dtrace_trapframe	td_dtrace->td_dtrace_trapframe
-#define	t_kinst		td_dtrace->td_kinst
+#define	t_kinst_tramp		td_dtrace->td_kinst_tramp
 #define	p_dtrace_helpers	p_dtrace->p_dtrace_helpers
 #define	p_dtrace_count	p_dtrace->p_dtrace_count
 #define	p_dtrace_probes	p_dtrace->p_dtrace_probes
diff --git a/sys/cddl/dev/kinst/amd64/kinst_isa.c b/sys/cddl/dev/kinst/amd64/kinst_isa.c
--- a/sys/cddl/dev/kinst/amd64/kinst_isa.c
+++ b/sys/cddl/dev/kinst/amd64/kinst_isa.c
@@ -197,7 +197,7 @@
 		if ((frame->tf_rflags & PSL_I) == 0)
 			tramp = DPCPU_GET(intr_tramp);
 		else
-			tramp = curthread->t_kinst;
+			tramp = curthread->t_kinst_tramp;
 		if (tramp == NULL) {
 			/*
 			 * A trampoline allocation failed, so this probe is
diff --git a/sys/cddl/dev/kinst/trampoline.c b/sys/cddl/dev/kinst/trampoline.c
--- a/sys/cddl/dev/kinst/trampoline.c
+++ b/sys/cddl/dev/kinst/trampoline.c
@@ -219,7 +219,7 @@
 static void
 kinst_thread_ctor(void *arg __unused, struct thread *td)
 {
-	td->t_kinst = kinst_trampoline_alloc(M_WAITOK);
+	td->t_kinst_tramp = kinst_trampoline_alloc(M_WAITOK);
 }
 
 static void
@@ -227,8 +227,8 @@
 {
 	void *tramp;
 
-	tramp = td->t_kinst;
-	td->t_kinst = NULL;
+	tramp = td->t_kinst_tramp;
+	td->t_kinst_tramp = NULL;
 
 	/*
 	 * This assumes that the thread_dtor event permits sleeping, which
@@ -259,7 +259,7 @@
 retry:
 		PROC_LOCK(p);
 		FOREACH_THREAD_IN_PROC(p, td) {
-			if (td->t_kinst != NULL)
+			if (td->t_kinst_tramp != NULL)
 				continue;
 			if (tramp == NULL) {
 				/*
@@ -284,7 +284,7 @@
 						goto retry;
 				}
 			}
-			td->t_kinst = tramp;
+			td->t_kinst_tramp = tramp;
 			tramp = NULL;
 		}
 		PROC_UNLOCK(p);
@@ -310,8 +310,9 @@
 	FOREACH_PROC_IN_SYSTEM(p) {
 		PROC_LOCK(p);
 		FOREACH_THREAD_IN_PROC(p, td) {
-			kinst_trampoline_dealloc_locked(td->t_kinst, false);
-			td->t_kinst = NULL;
+			kinst_trampoline_dealloc_locked(td->t_kinst_tramp,
+			    false);
+			td->t_kinst_tramp = NULL;
 		}
 		PROC_UNLOCK(p);
 	}