Index: sys/kern/subr_syscall.c
===================================================================
--- sys/kern/subr_syscall.c
+++ sys/kern/subr_syscall.c
@@ -127,12 +127,6 @@
 	}
 #endif
 
-	error = syscall_thread_enter(td, se);
-	if (error != 0) {
-		td->td_errno = error;
-		goto retval;
-	}
-
 	/*
 	 * Fetch fast sigblock value at the time of syscall entry to
 	 * handle sleepqueue primitives which might call cursig().
@@ -145,7 +139,14 @@
 	    ("%s: TDP_NERRNO set", __func__));
 
 	if (__predict_false(SYSTRACE_ENABLED() ||
-	    AUDIT_SYSCALL_ENTER(sa->code, td))) {
+	    AUDIT_SYSCALL_ENTER(sa->code, td) ||
+	    (se->sy_thrcnt & SY_THR_STATIC) == 0)) {
+		error = _syscall_thread_enter(td, se);
+		if (error != 0) {
+			td->td_errno = error;
+			goto retval;
+		}
+
 #ifdef KDTRACE_HOOKS
 		/* Give the syscall:::entry DTrace probe a chance to fire. */
 		if (__predict_false(se->sy_entry != 0))
@@ -175,6 +176,8 @@
 			(*systrace_probe_func)(sa, SYSTRACE_RETURN,
 			    error ? -1 : td->td_retval[0]);
 #endif
+
+		_syscall_thread_exit(td, se);
 	} else {
 		error = (se->sy_call)(td, sa->args);
 		/* Save the latest error return value. */
@@ -183,7 +186,6 @@
 		else
 			td->td_errno = error;
 	}
-	syscall_thread_exit(td, se);
 
  retval:
 	KTR_STOP4(KTR_SYSC, "syscall", syscallname(p, sa->code),
Index: sys/sys/sysent.h
===================================================================
--- sys/sys/sysent.h
+++ sys/sys/sysent.h
@@ -297,24 +297,6 @@
 int	_syscall_thread_enter(struct thread *td, struct sysent *se);
 void	_syscall_thread_exit(struct thread *td, struct sysent *se);
 
-static inline int
-syscall_thread_enter(struct thread *td, struct sysent *se)
-{
-
-	if (__predict_true((se->sy_thrcnt & SY_THR_STATIC) != 0))
-		return (0);
-	return (_syscall_thread_enter(td, se));
-}
-
-static inline void
-syscall_thread_exit(struct thread *td, struct sysent *se)
-{
-
-	if (__predict_true((se->sy_thrcnt & SY_THR_STATIC) != 0))
-		return;
-	_syscall_thread_exit(td, se);
-}
-
 int shared_page_alloc(int size, int align);
 int shared_page_fill(int size, int align, const void *data);
 void shared_page_write(int base, int size, const void *data);