Index: sys/powerpc/aim/trap.c
===================================================================
--- sys/powerpc/aim/trap.c	(revision 258471)
+++ sys/powerpc/aim/trap.c	(working copy)
@@ -34,8 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/kdb.h>
 #include <sys/proc.h>
Index: sys/powerpc/aim/locore32.S
===================================================================
--- sys/powerpc/aim/locore32.S	(revision 258471)
+++ sys/powerpc/aim/locore32.S	(working copy)
@@ -66,8 +66,6 @@
 #include <machine/asm.h>
 #include "opt_platform.h"
 
-#include "opt_kdtrace.h"
-
 /* Locate the per-CPU data structure */
 #define GET_CPUINFO(r)  \
         mfsprg0  r
Index: sys/powerpc/aim/locore64.S
===================================================================
--- sys/powerpc/aim/locore64.S	(revision 258471)
+++ sys/powerpc/aim/locore64.S	(working copy)
@@ -65,8 +65,6 @@
 #include <machine/spr.h>
 #include <machine/asm.h>
 
-#include "opt_kdtrace.h"
-
 /* Locate the per-CPU data structure */
 #define GET_CPUINFO(r)  \
         mfsprg0  r
Index: sys/conf/options
===================================================================
--- sys/conf/options	(revision 258471)
+++ sys/conf/options	(working copy)
@@ -126,7 +126,7 @@ GEOM_UZIP	opt_geom.h
 GEOM_VIRSTOR	opt_geom.h
 GEOM_VOL	opt_geom.h
 GEOM_ZERO	opt_geom.h
-KDTRACE_HOOKS	opt_kdtrace.h
+KDTRACE_HOOKS	opt_global.h
 KSTACK_MAX_PAGES
 KSTACK_PAGES
 KTRACE
Index: sys/nfsclient/nfs_krpc.c
===================================================================
--- sys/nfsclient/nfs_krpc.c	(revision 258471)
+++ sys/nfsclient/nfs_krpc.c	(working copy)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "opt_inet6.h"
-#include "opt_kdtrace.h"
 #include "opt_kgssapi.h"
 
 #include <sys/param.h>
Index: sys/nfsclient/nfs_vnops.c
===================================================================
--- sys/nfsclient/nfs_vnops.c	(revision 258471)
+++ sys/nfsclient/nfs_vnops.c	(working copy)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "opt_inet.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
Index: sys/nfsclient/nfs_bio.c
===================================================================
--- sys/nfsclient/nfs_bio.c	(revision 258471)
+++ sys/nfsclient/nfs_bio.c	(working copy)
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
Index: sys/nfsclient/nfs_subs.c
===================================================================
--- sys/nfsclient/nfs_subs.c	(revision 258471)
+++ sys/nfsclient/nfs_subs.c	(working copy)
@@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$");
  * copy data between mbuf chains and uio lists.
  */
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
Index: sys/kern/kern_timeout.c
===================================================================
--- sys/kern/kern_timeout.c	(revision 258471)
+++ sys/kern/kern_timeout.c	(working copy)
@@ -38,7 +38,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_callout_profiling.h"
-#include "opt_kdtrace.h"
 #if defined(__arm__)
 #include "opt_timer.h"
 #endif
Index: sys/kern/subr_devstat.c
===================================================================
--- sys/kern/subr_devstat.c	(revision 258471)
+++ sys/kern/subr_devstat.c	(working copy)
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
Index: sys/kern/kern_mutex.c
===================================================================
--- sys/kern/kern_mutex.c	(revision 258471)
+++ sys/kern/kern_mutex.c	(working copy)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_ddb.h"
 #include "opt_global.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_sched.h"
 
 #include <sys/param.h>
@@ -249,8 +248,6 @@ __mtx_unlock_flags(volatile uintptr_t *c, int opts
 	    line);
 	mtx_assert(m, MA_OWNED);
 
-	if (m->mtx_recurse == 0)
-		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_MTX_UNLOCK_RELEASE, m);
 	__mtx_unlock(m, curthread, opts, file, line);
 	curthread->td_locks--;
 }
Index: sys/kern/kern_thread.c
===================================================================
--- sys/kern/kern_thread.c	(revision 258471)
+++ sys/kern/kern_thread.c	(working copy)
@@ -27,7 +27,6 @@
  */
 
 #include "opt_witness.h"
-#include "opt_kdtrace.h"
 #include "opt_hwpmc_hooks.h"
 
 #include <sys/cdefs.h>
Index: sys/kern/sched_ule.c
===================================================================
--- sys/kern/sched_ule.c	(revision 258471)
+++ sys/kern/sched_ule.c	(working copy)
@@ -39,7 +39,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_sched.h"
 
 #include <sys/param.h>
Index: sys/kern/vfs_syscalls.c
===================================================================
--- sys/kern/vfs_syscalls.c	(revision 258471)
+++ sys/kern/vfs_syscalls.c	(working copy)
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_capsicum.h"
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
Index: sys/kern/vfs_lookup.c
===================================================================
--- sys/kern/vfs_lookup.c	(revision 258471)
+++ sys/kern/vfs_lookup.c	(working copy)
@@ -38,7 +38,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_capsicum.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
Index: sys/kern/kern_sig.c
===================================================================
--- sys/kern/kern_sig.c	(revision 258471)
+++ sys/kern/kern_sig.c	(working copy)
@@ -38,7 +38,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_core.h"
 #include "opt_procdesc.h"
Index: sys/kern/kern_synch.c
===================================================================
--- sys/kern/kern_synch.c	(revision 258471)
+++ sys/kern/kern_synch.c	(working copy)
@@ -37,7 +37,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_sched.h"
 
Index: sys/kern/kern_clock.c
===================================================================
--- sys/kern/kern_clock.c	(revision 258471)
+++ sys/kern/kern_clock.c	(working copy)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_kdb.h"
 #include "opt_device_polling.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_ntp.h"
 #include "opt_watchdog.h"
 
Index: sys/kern/kern_proc.c
===================================================================
--- sys/kern/kern_proc.c	(revision 258471)
+++ sys/kern/kern_proc.c	(working copy)
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_kstack_pages.h"
 #include "opt_stack.h"
Index: sys/kern/subr_trap.c
===================================================================
--- sys/kern/subr_trap.c	(revision 258471)
+++ sys/kern/subr_trap.c	(working copy)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
-#include "opt_kdtrace.h"
 #include "opt_sched.h"
 
 #include <sys/param.h>
Index: sys/kern/sched_4bsd.c
===================================================================
--- sys/kern/sched_4bsd.c	(revision 258471)
+++ sys/kern/sched_4bsd.c	(working copy)
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_sched.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/kern/kern_rwlock.c
===================================================================
--- sys/kern/kern_rwlock.c	(revision 258471)
+++ sys/kern/kern_rwlock.c	(working copy)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_no_adaptive_rwlocks.h"
 
 #include <sys/param.h>
@@ -322,8 +321,6 @@ _rw_wunlock_cookie(volatile uintptr_t *c, const ch
 	WITNESS_UNLOCK(&rw->lock_object, LOP_EXCLUSIVE, file, line);
 	LOCK_LOG_LOCK("WUNLOCK", &rw->lock_object, 0, rw->rw_recurse, file,
 	    line);
-	if (!rw_recursed(rw))
-		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_RW_WUNLOCK_RELEASE, rw);
 	__rw_wunlock(rw, curthread, file, line);
 	curthread->td_locks--;
 }
Index: sys/kern/subr_turnstile.c
===================================================================
--- sys/kern/subr_turnstile.c	(revision 258471)
+++ sys/kern/subr_turnstile.c	(working copy)
@@ -60,7 +60,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 #include "opt_turnstile_profiling.h"
 #include "opt_sched.h"
 
Index: sys/kern/kern_malloc.c
===================================================================
--- sys/kern/kern_malloc.c	(revision 258471)
+++ sys/kern/kern_malloc.c	(working copy)
@@ -46,7 +46,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 #include "opt_vm.h"
 
 #include <sys/param.h>
Index: sys/kern/kern_exit.c
===================================================================
--- sys/kern/kern_exit.c	(revision 258471)
+++ sys/kern/kern_exit.c	(working copy)
@@ -38,7 +38,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_procdesc.h"
 
Index: sys/kern/kern_clocksource.c
===================================================================
--- sys/kern/kern_clocksource.c	(revision 258471)
+++ sys/kern/kern_clocksource.c	(working copy)
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "opt_device_polling.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/kern/subr_sleepqueue.c
===================================================================
--- sys/kern/subr_sleepqueue.c	(revision 258471)
+++ sys/kern/subr_sleepqueue.c	(working copy)
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_sleepqueue_profiling.h"
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 #include "opt_sched.h"
 
 #include <sys/param.h>
Index: sys/kern/kern_sx.c
===================================================================
--- sys/kern/kern_sx.c	(revision 258471)
+++ sys/kern/kern_sx.c	(working copy)
@@ -38,7 +38,6 @@
 
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_no_adaptive_sx.h"
 
 #include <sys/cdefs.h>
@@ -109,7 +108,6 @@ PMC_SOFT_DECLARE( , , lock, failed);
  * Returns true if an exclusive lock is recursed.  It assumes
  * curthread currently has an exclusive lock.
  */
-#define	sx_recurse		lock_object.lo_data
 #define	sx_recursed(sx)		((sx)->sx_recurse != 0)
 
 static void	assert_sx(const struct lock_object *lock, int what);
@@ -365,7 +363,6 @@ _sx_sunlock(struct sx *sx, const char *file, int l
 	WITNESS_UNLOCK(&sx->lock_object, 0, file, line);
 	LOCK_LOG_LOCK("SUNLOCK", &sx->lock_object, 0, 0, file, line);
 	__sx_sunlock(sx, file, line);
-	LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_SUNLOCK_RELEASE, sx);
 	curthread->td_locks--;
 }
 
@@ -381,8 +378,6 @@ _sx_xunlock(struct sx *sx, const char *file, int l
 	WITNESS_UNLOCK(&sx->lock_object, LOP_EXCLUSIVE, file, line);
 	LOCK_LOG_LOCK("XUNLOCK", &sx->lock_object, 0, sx->sx_recurse, file,
 	    line);
-	if (!sx_recursed(sx))
-		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_XUNLOCK_RELEASE, sx);
 	__sx_xunlock(sx, curthread, file, line);
 	curthread->td_locks--;
 }
Index: sys/kern/kern_exec.c
===================================================================
--- sys/kern/kern_exec.c	(revision 258471)
+++ sys/kern/kern_exec.c	(working copy)
@@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_capsicum.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_vm.h"
 
Index: sys/kern/kern_sdt.c
===================================================================
--- sys/kern/kern_sdt.c	(revision 258471)
+++ sys/kern/kern_sdt.c	(working copy)
@@ -25,8 +25,6 @@
  * $FreeBSD$
  */
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sdt.h>
Index: sys/kern/kern_fork.c
===================================================================
--- sys/kern/kern_fork.c	(revision 258471)
+++ sys/kern/kern_fork.c	(working copy)
@@ -37,7 +37,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_kstack_pages.h"
 #include "opt_procdesc.h"
Index: sys/kern/kern_lockstat.c
===================================================================
--- sys/kern/kern_lockstat.c	(revision 258471)
+++ sys/kern/kern_lockstat.c	(working copy)
@@ -32,8 +32,6 @@
  *
  */
 
-#include "opt_kdtrace.h"
-
 #ifdef KDTRACE_HOOKS
 
 #include <sys/time.h>
Index: sys/kern/kern_lock.c
===================================================================
--- sys/kern/kern_lock.c	(revision 258471)
+++ sys/kern/kern_lock.c	(working copy)
@@ -29,7 +29,6 @@
 #include "opt_adaptive_lockmgrs.h"
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
Index: sys/kern/kern_priv.c
===================================================================
--- sys/kern/kern_priv.c	(revision 258471)
+++ sys/kern/kern_priv.c	(working copy)
@@ -28,8 +28,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_kdtrace.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
Index: sys/kern/subr_syscall.c
===================================================================
--- sys/kern/subr_syscall.c	(revision 258471)
+++ sys/kern/subr_syscall.c	(working copy)
@@ -40,7 +40,6 @@
 
 #include "opt_capsicum.h"
 #include "opt_ktrace.h"
-#include "opt_kdtrace.h"
 
 __FBSDID("$FreeBSD$");
 
Index: sys/kern/kern_rmlock.c
===================================================================
--- sys/kern/kern_rmlock.c	(revision 258471)
+++ sys/kern/kern_rmlock.c	(working copy)
@@ -35,7 +35,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/kern/kern_racct.c
===================================================================
--- sys/kern/kern_racct.c	(revision 258471)
+++ sys/kern/kern_racct.c	(working copy)
@@ -32,7 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_sched.h"
 
 #include <sys/param.h>
Index: sys/kern/vfs_cache.c
===================================================================
--- sys/kern/vfs_cache.c	(revision 258471)
+++ sys/kern/vfs_cache.c	(working copy)
@@ -35,7 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
Index: sys/cam/ctl/ctl_backend_block.c
===================================================================
--- sys/cam/ctl/ctl_backend_block.c	(revision 258471)
+++ sys/cam/ctl/ctl_backend_block.c	(working copy)
@@ -42,8 +42,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <opt_kdtrace.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
Index: sys/tools/vnode_if.awk
===================================================================
--- sys/tools/vnode_if.awk	(revision 258471)
+++ sys/tools/vnode_if.awk	(working copy)
@@ -165,8 +165,6 @@ if (hfile) {
 
 if (cfile) {
 	printc(common_head \
-	    "#include \"opt_kdtrace.h\"\n" \
-	    "\n" \
 	    "#include <sys/param.h>\n" \
 	    "#include <sys/event.h>\n" \
 	    "#include <sys/kernel.h>\n" \
Index: sys/opencrypto/deflate.c
===================================================================
--- sys/opencrypto/deflate.c	(revision 258471)
+++ sys/opencrypto/deflate.c	(working copy)
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/malloc.h>
Index: sys/opencrypto/crypto.c
===================================================================
--- sys/opencrypto/crypto.c	(revision 258471)
+++ sys/opencrypto/crypto.c	(working copy)
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
 #define	CRYPTO_TIMING				/* enable timing support */
 
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/netinet/tcp_input.c
===================================================================
--- sys/netinet/tcp_input.c	(revision 258471)
+++ sys/netinet/tcp_input.c	(working copy)
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_tcpdebug.h"
 
 #include <sys/param.h>
Index: sys/netinet/tcp_subr.c
===================================================================
--- sys/netinet/tcp_subr.c	(revision 258471)
+++ sys/netinet/tcp_subr.c	(working copy)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_tcpdebug.h"
 
 #include <sys/param.h>
Index: sys/netinet/tcp_output.c
===================================================================
--- sys/netinet/tcp_output.c	(revision 258471)
+++ sys/netinet/tcp_output.c	(working copy)
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_tcpdebug.h"
 
 #include <sys/param.h>
Index: sys/netinet/ip_input.c
===================================================================
--- sys/netinet/ip_input.c	(revision 258471)
+++ sys/netinet/ip_input.c	(working copy)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_ipfw.h"
 #include "opt_ipstealth.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_route.h"
 
 #include <sys/param.h>
Index: sys/netinet/sctp_dtrace_define.h
===================================================================
--- sys/netinet/sctp_dtrace_define.h	(revision 258471)
+++ sys/netinet/sctp_dtrace_define.h	(working copy)
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #ifndef _NETINET_SCTP_DTRACE_DEFINE_H_
 #define _NETINET_SCTP_DTRACE_DEFINE_H_
 
-#include "opt_kdtrace.h"
 #include <sys/kernel.h>
 #include <sys/sdt.h>
 
Index: sys/netinet/udp_usrreq.c
===================================================================
--- sys/netinet/udp_usrreq.c	(revision 258471)
+++ sys/netinet/udp_usrreq.c	(working copy)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/domain.h>
Index: sys/netinet/ip_output.c
===================================================================
--- sys/netinet/ip_output.c	(revision 258471)
+++ sys/netinet/ip_output.c	(working copy)
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ipfw.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_mbuf_stress_test.h"
 #include "opt_mpath.h"
 #include "opt_route.h"
Index: sys/netinet/in_kdtrace.c
===================================================================
--- sys/netinet/in_kdtrace.c	(revision 258471)
+++ sys/netinet/in_kdtrace.c	(working copy)
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sdt.h>
Index: sys/netinet/sctp_dtrace_declare.h
===================================================================
--- sys/netinet/sctp_dtrace_declare.h	(revision 258471)
+++ sys/netinet/sctp_dtrace_declare.h	(working copy)
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #ifndef _NETINET_SCTP_DTRACE_DECLARE_H_
 #define _NETINET_SCTP_DTRACE_DECLARE_H_
 
-#include "opt_kdtrace.h"
 #include <sys/kernel.h>
 #include <sys/sdt.h>
 
Index: sys/netinet/ip_fastfwd.c
===================================================================
--- sys/netinet/ip_fastfwd.c	(revision 258471)
+++ sys/netinet/ip_fastfwd.c	(working copy)
@@ -78,7 +78,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ipfw.h"
 #include "opt_ipstealth.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/modules/dtrace/lockstat/Makefile
===================================================================
--- sys/modules/dtrace/lockstat/Makefile	(revision 258471)
+++ sys/modules/dtrace/lockstat/Makefile	(working copy)
@@ -5,7 +5,7 @@
 KMOD=		lockstat
 SRCS=		lockstat.c 
 
-SRCS+=		vnode_if.h opt_kdtrace.h
+SRCS+=		vnode_if.h
 
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
Index: sys/modules/dtrace/sdt/Makefile
===================================================================
--- sys/modules/dtrace/sdt/Makefile	(revision 258471)
+++ sys/modules/dtrace/sdt/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 KMOD=		sdt
 SRCS=		sdt.c
-SRCS+=		vnode_if.h opt_kdtrace.h
+SRCS+=		vnode_if.h
 
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
Index: sys/modules/dtrace/dtrace_test/Makefile
===================================================================
--- sys/modules/dtrace/dtrace_test/Makefile	(revision 258471)
+++ sys/modules/dtrace/dtrace_test/Makefile	(working copy)
@@ -5,7 +5,6 @@
 KMOD=		dtrace_test
 SRCS=		dtrace_test.c
 
-SRCS+=		opt_kdtrace.h
 SRCS+=		vnode_if.h
 
 CFLAGS+=	-I${.CURDIR}/../../..
Index: sys/modules/nfscl/Makefile
===================================================================
--- sys/modules/nfscl/Makefile	(revision 258471)
+++ sys/modules/nfscl/Makefile	(working copy)
@@ -17,7 +17,6 @@ SRCS=	vnode_if.h \
 	opt_bootp.h \
 	opt_inet.h \
 	opt_inet6.h \
-	opt_kdtrace.h \
 	opt_kgssapi.h \
 	opt_nfs.h \
 	opt_nfsroot.h \
Index: sys/modules/ctl/Makefile
===================================================================
--- sys/modules/ctl/Makefile	(revision 258471)
+++ sys/modules/ctl/Makefile	(working copy)
@@ -22,7 +22,6 @@ SRCS+=	bus_if.h
 SRCS+=	device_if.h
 SRCS+=	vnode_if.h
 SRCS+=	opt_cam.h
-SRCS+=	opt_kdtrace.h
 
 #CFLAGS+=-DICL_KERNEL_PROXY
 
Index: sys/modules/ip6_mroute_mod/Makefile
===================================================================
--- sys/modules/ip6_mroute_mod/Makefile	(revision 258471)
+++ sys/modules/ip6_mroute_mod/Makefile	(working copy)
@@ -7,7 +7,7 @@
 KMOD=	ip6_mroute
 
 SRCS=	ip6_mroute.c
-SRCS+=	opt_inet6.h opt_kdtrace.h opt_mrouting.h
+SRCS+=	opt_inet6.h opt_mrouting.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet6.h:
Index: sys/modules/nfscommon/Makefile
===================================================================
--- sys/modules/nfscommon/Makefile	(revision 258471)
+++ sys/modules/nfscommon/Makefile	(working copy)
@@ -8,7 +8,6 @@ SRCS=	vnode_if.h \
 	nfs_commonport.c \
 	nfs_commonsubs.c \
 	opt_inet6.h \
-	opt_kdtrace.h \
 	opt_kgssapi.h \
 	opt_nfs.h \
 	opt_ufs.h
Index: sys/modules/crypto/Makefile
===================================================================
--- sys/modules/crypto/Makefile	(revision 258471)
+++ sys/modules/crypto/Makefile	(working copy)
@@ -16,6 +16,6 @@ SRCS	+= skipjack.c bf_enc.c bf_ecb.c bf_skey.c
 SRCS	+= des_ecb.c des_enc.c des_setkey.c
 SRCS	+= sha1.c sha2.c
 SRCS	+= opt_param.h cryptodev_if.h bus_if.h device_if.h
-SRCS	+= opt_ddb.h opt_kdtrace.h
+SRCS	+= opt_ddb.h
 SRCS	+= camellia.c camellia-api.c
 .include <bsd.kmod.mk>
Index: sys/modules/nfsclient/Makefile
===================================================================
--- sys/modules/nfsclient/Makefile	(revision 258471)
+++ sys/modules/nfsclient/Makefile	(working copy)
@@ -7,7 +7,7 @@ SRCS=	vnode_if.h \
 	nfs_bio.c nfs_node.c nfs_subs.c nfs_nfsiod.c \
 	nfs_vfsops.c nfs_vnops.c nfs_krpc.c \
 	opt_inet.h opt_nfs.h opt_bootp.h opt_nfsroot.h
-SRCS+=	opt_inet6.h opt_kdtrace.h opt_kgssapi.h
+SRCS+=	opt_inet6.h opt_kgssapi.h
 
 .if !defined(KERNBUILDDIR)
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
Index: sys/modules/linux/Makefile
===================================================================
--- sys/modules/linux/Makefile	(revision 258471)
+++ sys/modules/linux/Makefile	(working copy)
@@ -13,8 +13,8 @@ SRCS=	linux_fork.c linux${SFX}_dummy.c linux_emul.
 	linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \
 	linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
 	linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \
-	opt_inet6.h opt_compat.h opt_kdtrace.h opt_posix.h opt_usb.h \
-	vnode_if.h device_if.h bus_if.h assym.s
+	opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \
+	device_if.h bus_if.h assym.s
 
 # XXX: for assym.s
 SRCS+=  opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h
Index: sys/modules/send/Makefile
===================================================================
--- sys/modules/send/Makefile	(revision 258471)
+++ sys/modules/send/Makefile	(working copy)
@@ -2,6 +2,6 @@
 .PATH: ${.CURDIR}/../../netinet6
 
 KMOD=	send
-SRCS=	send.c opt_kdtrace.h
+SRCS=	send.c
 
 .include <bsd.kmod.mk>
Index: sys/mips/mips/exception.S
===================================================================
--- sys/mips/mips/exception.S	(revision 258471)
+++ sys/mips/mips/exception.S	(working copy)
@@ -55,7 +55,7 @@
  */
 
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
+
 #include <machine/asm.h>
 #include <machine/cpu.h>
 #include <machine/regnum.h>
Index: sys/mips/mips/trap.c
===================================================================
--- sys/mips/mips/trap.c	(revision 258471)
+++ sys/mips/mips/trap.c	(working copy)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_ddb.h"
 #include "opt_global.h"
 #include "opt_ktrace.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/fs/nfsclient/nfs_clbio.c
===================================================================
--- sys/fs/nfsclient/nfs_clbio.c	(revision 258471)
+++ sys/fs/nfsclient/nfs_clbio.c	(working copy)
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
Index: sys/fs/nfsclient/nfs_clsubs.c
===================================================================
--- sys/fs/nfsclient/nfs_clsubs.c	(revision 258471)
+++ sys/fs/nfsclient/nfs_clsubs.c	(working copy)
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 /*
  * These functions support the macros and help fiddle mbuf chains for
  * the nfs op functions. They do things like create the rpc header and
Index: sys/fs/nfsclient/nfs_clport.c
===================================================================
--- sys/fs/nfsclient/nfs_clport.c	(revision 258471)
+++ sys/fs/nfsclient/nfs_clport.c	(working copy)
@@ -35,7 +35,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
-#include "opt_kdtrace.h"
 
 #include <sys/capability.h>
 
Index: sys/fs/nfsclient/nfs_clnode.c
===================================================================
--- sys/fs/nfsclient/nfs_clnode.c	(revision 258471)
+++ sys/fs/nfsclient/nfs_clnode.c	(working copy)
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
Index: sys/fs/nfsclient/nfs_clvnops.c
===================================================================
--- sys/fs/nfsclient/nfs_clvnops.c	(revision 258471)
+++ sys/fs/nfsclient/nfs_clvnops.c	(working copy)
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
  * vnode op calls for Sun NFS version 2, 3 and 4
  */
 
-#include "opt_kdtrace.h"
 #include "opt_inet.h"
 
 #include <sys/param.h>
Index: sys/fs/nfs/nfs_commonkrpc.c
===================================================================
--- sys/fs/nfs/nfs_commonkrpc.c	(revision 258471)
+++ sys/fs/nfs/nfs_commonkrpc.c	(working copy)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
  * Socket operations for use by nfs
  */
 
-#include "opt_kdtrace.h"
 #include "opt_kgssapi.h"
 #include "opt_nfs.h"
 
Index: sys/dev/sfxge/common/efsys.h
===================================================================
--- sys/dev/sfxge/common/efsys.h	(revision 258471)
+++ sys/dev/sfxge/common/efsys.h	(working copy)
@@ -270,7 +270,7 @@ typedef struct __efsys_identifier_s	efsys_identifi
 
 /* PROBE */
 
-#ifndef KDTRACE_HOOKS
+#ifndef DTRACE_PROBE
 
 #define EFSYS_PROBE(_name)
 
@@ -295,7 +295,7 @@ typedef struct __efsys_identifier_s	efsys_identifi
 	    _type3, _arg3, _type4, _arg4, _type5, _arg5,		\
 	    _type6, _arg6, _type7, _arg7)
 
-#else /* KDTRACE_HOOKS */
+#else /* DTRACE_PROBE */
 
 #define	EFSYS_PROBE(_name)						\
 	DTRACE_PROBE(_name)
@@ -359,7 +359,7 @@ typedef struct __efsys_identifier_s	efsys_identifi
 	    _type6, _arg6)
 #endif
 
-#endif /* KDTRACE_HOOKS */
+#endif /* DTRACE_PROBE */
 
 /* DMA */
 
Index: sys/dev/xen/blkback/blkback.c
===================================================================
--- sys/dev/xen/blkback/blkback.c	(revision 258471)
+++ sys/dev/xen/blkback/blkback.c	(working copy)
@@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$");
  *        a FreeBSD domain to other domains.
  */
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
Index: sys/compat/linux/linux_sysctl.c
===================================================================
--- sys/compat/linux/linux_sysctl.c	(revision 258471)
+++ sys/compat/linux/linux_sysctl.c	(working copy)
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
Index: sys/compat/linux/linux_misc.c
===================================================================
--- sys/compat/linux/linux_misc.c	(revision 258471)
+++ sys/compat/linux/linux_misc.c	(working copy)
@@ -31,7 +31,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/blist.h>
Index: sys/compat/linux/linux_fork.c
===================================================================
--- sys/compat/linux/linux_fork.c	(revision 258471)
+++ sys/compat/linux/linux_fork.c	(working copy)
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/compat/linux/linux_emul.c
===================================================================
--- sys/compat/linux/linux_emul.c	(revision 258471)
+++ sys/compat/linux/linux_emul.c	(working copy)
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/compat/linux/linux_mib.c
===================================================================
--- sys/compat/linux/linux_mib.c	(revision 258471)
+++ sys/compat/linux/linux_mib.c	(working copy)
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
Index: sys/compat/linux/linux_util.c
===================================================================
--- sys/compat/linux/linux_util.c	(revision 258471)
+++ sys/compat/linux/linux_util.c	(working copy)
@@ -33,7 +33,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>
Index: sys/compat/linux/linux_uid16.c
===================================================================
--- sys/compat/linux/linux_uid16.c	(revision 258471)
+++ sys/compat/linux/linux_uid16.c	(working copy)
@@ -28,7 +28,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/fcntl.h>
 #include <sys/param.h>
Index: sys/compat/linux/linux_futex.c
===================================================================
--- sys/compat/linux/linux_futex.c	(revision 258471)
+++ sys/compat/linux/linux_futex.c	(working copy)
@@ -38,7 +38,6 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 20
 #endif
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/compat/linux/linux_time.c
===================================================================
--- sys/compat/linux/linux_time.c	(revision 258471)
+++ sys/compat/linux/linux_time.c	(working copy)
@@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 20
 #endif
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
Index: sys/pc98/pc98/machdep.c
===================================================================
--- sys/pc98/pc98/machdep.c	(revision 258471)
+++ sys/pc98/pc98/machdep.c	(working copy)
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_mp_watchdog.h"
 #include "opt_npx.h"
 #include "opt_perfmon.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>
Index: sys/x86/x86/local_apic.c
===================================================================
--- sys/x86/x86/local_apic.c	(revision 258471)
+++ sys/x86/x86/local_apic.c	(working copy)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_atpic.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 
 #include "opt_ddb.h"
 
Index: sys/net/vnet.c
===================================================================
--- sys/net/vnet.c	(revision 258471)
+++ sys/net/vnet.c	(working copy)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 #include "opt_kdb.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kdb.h>
Index: sys/i386/linux/linux_dummy.c
===================================================================
--- sys/i386/linux/linux_dummy.c	(revision 258471)
+++ sys/i386/linux/linux_dummy.c	(working copy)
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
Index: sys/i386/i386/machdep.c
===================================================================
--- sys/i386/i386/machdep.c	(revision 258471)
+++ sys/i386/i386/machdep.c	(working copy)
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_perfmon.h"
 #include "opt_platform.h"
 #include "opt_xbox.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>
Index: sys/i386/i386/trap.c
===================================================================
--- sys/i386/i386/trap.c	(revision 258471)
+++ sys/i386/i386/trap.c	(working copy)
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_hwpmc_hooks.h"
 #include "opt_isa.h"
 #include "opt_kdb.h"
-#include "opt_kdtrace.h"
 #include "opt_npx.h"
 #include "opt_trap.h"
 
Index: sys/i386/i386/exception.s
===================================================================
--- sys/i386/i386/exception.s	(revision 258471)
+++ sys/i386/i386/exception.s	(working copy)
@@ -37,7 +37,6 @@
 #include "opt_apic.h"
 #include "opt_atpic.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_npx.h"
 
 #include <machine/asmacros.h>
Index: sys/netinet6/udp6_usrreq.c
===================================================================
--- sys/netinet6/udp6_usrreq.c	(revision 258471)
+++ sys/netinet6/udp6_usrreq.c	(working copy)
@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 #include "opt_ipfw.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/jail.h>
Index: sys/netinet6/nd6.c
===================================================================
--- sys/netinet6/nd6.c	(revision 258471)
+++ sys/netinet6/nd6.c	(working copy)
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/netinet6/send.c
===================================================================
--- sys/netinet6/send.c	(revision 258471)
+++ sys/netinet6/send.c	(working copy)
@@ -27,8 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
Index: sys/netinet6/ip6_input.c
===================================================================
--- sys/netinet6/ip6_input.c	(revision 258471)
+++ sys/netinet6/ip6_input.c	(working copy)
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 #include "opt_ipfw.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_route.h"
 
 #include <sys/param.h>
Index: sys/netinet6/ip6_mroute.c
===================================================================
--- sys/netinet6/ip6_mroute.c	(revision 258471)
+++ sys/netinet6/ip6_mroute.c	(working copy)
@@ -82,7 +82,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/callout.h>
Index: sys/cddl/dev/dtrace/dtrace_test.c
===================================================================
--- sys/cddl/dev/dtrace/dtrace_test.c	(revision 258471)
+++ sys/cddl/dev/dtrace/dtrace_test.c	(working copy)
@@ -25,8 +25,6 @@
  * $FreeBSD$
  *
  */
-#include "opt_kdtrace.h"
-
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
Index: sys/cddl/dev/lockstat/lockstat.c
===================================================================
--- sys/cddl/dev/lockstat/lockstat.c	(revision 258471)
+++ sys/cddl/dev/lockstat/lockstat.c	(working copy)
@@ -29,8 +29,6 @@
  * Use is subject to license terms.
  */
 
-#include "opt_kdtrace.h"
-
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/cddl/dev/sdt/sdt.c
===================================================================
--- sys/cddl/dev/sdt/sdt.c	(revision 258471)
+++ sys/cddl/dev/sdt/sdt.c	(working copy)
@@ -39,8 +39,6 @@
  * unloaded; in particular, probes may not span multiple kernel modules.
  */
 
-#include "opt_kdtrace.h"
-
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
Index: sys/security/mac/mac_process.c
===================================================================
--- sys/security/mac/mac_process.c	(revision 258471)
+++ sys/security/mac/mac_process.c	(working copy)
@@ -45,7 +45,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_priv.c
===================================================================
--- sys/security/mac/mac_priv.c	(revision 258471)
+++ sys/security/mac/mac_priv.c	(working copy)
@@ -38,7 +38,6 @@
 #include "sys/cdefs.h"
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_system.c
===================================================================
--- sys/security/mac/mac_system.c	(revision 258471)
+++ sys/security/mac/mac_system.c	(working copy)
@@ -53,7 +53,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_net.c
===================================================================
--- sys/security/mac/mac_net.c	(revision 258471)
+++ sys/security/mac/mac_net.c	(working copy)
@@ -45,7 +45,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_socket.c
===================================================================
--- sys/security/mac/mac_socket.c	(revision 258471)
+++ sys/security/mac/mac_socket.c	(working copy)
@@ -45,7 +45,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_pipe.c
===================================================================
--- sys/security/mac/mac_pipe.c	(revision 258471)
+++ sys/security/mac/mac_pipe.c	(working copy)
@@ -40,7 +40,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_framework.c
===================================================================
--- sys/security/mac/mac_framework.c	(revision 258471)
+++ sys/security/mac/mac_framework.c	(working copy)
@@ -66,7 +66,6 @@
  * src/sys/security/mac_*.
  */
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/cdefs.h>
Index: sys/security/mac/mac_vfs.c
===================================================================
--- sys/security/mac/mac_vfs.c	(revision 258471)
+++ sys/security/mac/mac_vfs.c	(working copy)
@@ -45,7 +45,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_inet.c
===================================================================
--- sys/security/mac/mac_inet.c	(revision 258471)
+++ sys/security/mac/mac_inet.c	(working copy)
@@ -45,7 +45,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_posix_sem.c
===================================================================
--- sys/security/mac/mac_posix_sem.c	(revision 258471)
+++ sys/security/mac/mac_posix_sem.c	(working copy)
@@ -39,7 +39,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 #include "opt_posix.h"
 
Index: sys/security/mac/mac_audit.c
===================================================================
--- sys/security/mac/mac_audit.c	(revision 258471)
+++ sys/security/mac/mac_audit.c	(working copy)
@@ -43,8 +43,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
Index: sys/security/mac/mac_sysv_sem.c
===================================================================
--- sys/security/mac/mac_sysv_sem.c	(revision 258471)
+++ sys/security/mac/mac_sysv_sem.c	(working copy)
@@ -40,7 +40,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_posix_shm.c
===================================================================
--- sys/security/mac/mac_posix_shm.c	(revision 258471)
+++ sys/security/mac/mac_posix_shm.c	(working copy)
@@ -39,7 +39,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_sysv_msg.c
===================================================================
--- sys/security/mac/mac_sysv_msg.c	(revision 258471)
+++ sys/security/mac/mac_sysv_msg.c	(working copy)
@@ -41,7 +41,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_sysv_shm.c
===================================================================
--- sys/security/mac/mac_sysv_shm.c	(revision 258471)
+++ sys/security/mac/mac_sysv_shm.c	(working copy)
@@ -40,7 +40,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/security/mac/mac_cred.c
===================================================================
--- sys/security/mac/mac_cred.c	(revision 258471)
+++ sys/security/mac/mac_cred.c	(working copy)
@@ -46,7 +46,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
Index: sys/amd64/linux32/linux32_dummy.c
===================================================================
--- sys/amd64/linux32/linux32_dummy.c	(revision 258471)
+++ sys/amd64/linux32/linux32_dummy.c	(working copy)
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
Index: sys/amd64/amd64/exception.S
===================================================================
--- sys/amd64/amd64/exception.S	(revision 258471)
+++ sys/amd64/amd64/exception.S	(working copy)
@@ -37,7 +37,6 @@
 #include "opt_atpic.h"
 #include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 
 #include <machine/asmacros.h>
 #include <machine/psl.h>
Index: sys/amd64/amd64/machdep.c
===================================================================
--- sys/amd64/amd64/machdep.c	(revision 258471)
+++ sys/amd64/amd64/machdep.c	(working copy)
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_perfmon.h"
 #include "opt_platform.h"
 #include "opt_sched.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>
Index: sys/amd64/amd64/trap.c
===================================================================
--- sys/amd64/amd64/trap.c	(revision 258471)
+++ sys/amd64/amd64/trap.c	(working copy)
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_hwpmc_hooks.h"
 #include "opt_isa.h"
 #include "opt_kdb.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>
Index: sys/sys/sx.h
===================================================================
--- sys/sys/sx.h	(revision 258471)
+++ sys/sys/sx.h	(working copy)
@@ -86,6 +86,8 @@
 
 #ifdef _KERNEL
 
+#define	sx_recurse	lock_object.lo_data
+
 /*
  * Function prototipes.  Routines that start with an underscore are not part
  * of the public interface and are wrappered with a macro.
@@ -163,6 +165,8 @@ __sx_xunlock(struct sx *sx, struct thread *td, con
 {
 	uintptr_t tid = (uintptr_t)td;
 
+	if (sx->sx_recurse == 0)
+		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_XUNLOCK_RELEASE, sx);
 	if (!atomic_cmpset_rel_ptr(&sx->sx_lock, tid, SX_LOCK_UNLOCKED))
 		_sx_xunlock_hard(sx, tid, file, line);
 }
@@ -196,6 +200,7 @@ __sx_sunlock(struct sx *sx, const char *file, int
 {
 	uintptr_t x = sx->sx_lock;
 
+	LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_SUNLOCK_RELEASE, sx);
 	if (x == (SX_SHARERS_LOCK(1) | SX_LOCK_EXCLUSIVE_WAITERS) ||
 	    !atomic_cmpset_rel_ptr(&sx->sx_lock, x, x - SX_ONE_SHARER))
 		_sx_sunlock_hard(sx, file, line);
Index: sys/sys/rwlock.h
===================================================================
--- sys/sys/rwlock.h	(revision 258471)
+++ sys/sys/rwlock.h	(working copy)
@@ -112,8 +112,12 @@
 									\
 	if ((rw)->rw_recurse)						\
 		(rw)->rw_recurse--;					\
-	else if (!_rw_write_unlock((rw), _tid))				\
-		_rw_wunlock_hard((rw), _tid, (file), (line));		\
+	else {								\
+		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_RW_WUNLOCK_RELEASE,	\
+		    (rw));						\
+		if (!_rw_write_unlock((rw), _tid))			\
+			_rw_wunlock_hard((rw), _tid, (file), (line));	\
+	}								\
 } while (0)
 
 /*
Index: sys/sys/mutex.h
===================================================================
--- sys/sys/mutex.h	(revision 258471)
+++ sys/sys/mutex.h	(working copy)
@@ -229,6 +229,9 @@ void	thread_lock_flags_(struct thread *, int, cons
 #define __mtx_unlock(mp, tid, opts, file, line) do {			\
 	uintptr_t _tid = (uintptr_t)(tid);				\
 									\
+	if ((mp)->mtx_recurse == 0)					\
+		 LOCKSTAT_PROFILE_RELEASE_LOCK(LS_MTX_UNLOCK_RELEASE,	\
+		    (mp));						\
 	if (!_mtx_release_lock((mp), _tid))				\
 		_mtx_unlock_sleep((mp), (opts), (file), (line));	\
 } while (0)