diff options
| author | Attilio Rao <attilio@FreeBSD.org> | 2013-11-25 07:38:45 +0000 |
|---|---|---|
| committer | Attilio Rao <attilio@FreeBSD.org> | 2013-11-25 07:38:45 +0000 |
| commit | 54366c0bd7d0ea904fb9ab32460c66d57684a7cb (patch) | |
| tree | e29b308276ced8b2028470c376a2a34193dc6c3c | |
| parent | 7c5b23111c5fd1992047922d4247c4a1ce1bb6c3 (diff) | |
Notes
120 files changed, 27 insertions, 152 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index a71428153d47f..d4e58b1cecb9c 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -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> diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index f578a7d38a4fc..31614f7c22d67 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -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> diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 3d319cd8778d5..f7d0afdad58a9 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -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> diff --git a/sys/amd64/linux32/linux32_dummy.c b/sys/amd64/linux32/linux32_dummy.c index 95bf3ec88e9c2..411c4d556fc49 100644 --- a/sys/amd64/linux32/linux32_dummy.c +++ b/sys/amd64/linux32/linux32_dummy.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c index 839fe0f9d8bcf..82cbb37f26623 100644 --- a/sys/cam/ctl/ctl_backend_block.c +++ b/sys/cam/ctl/ctl_backend_block.c @@ -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> diff --git a/sys/cddl/dev/dtrace/dtrace_test.c b/sys/cddl/dev/dtrace/dtrace_test.c index f50ad89de6b04..9e2f96b9c2ca9 100644 --- a/sys/cddl/dev/dtrace/dtrace_test.c +++ b/sys/cddl/dev/dtrace/dtrace_test.c @@ -25,8 +25,6 @@ * $FreeBSD$ * */ -#include "opt_kdtrace.h" - #include <sys/cdefs.h> #include <sys/types.h> #include <sys/param.h> diff --git a/sys/cddl/dev/lockstat/lockstat.c b/sys/cddl/dev/lockstat/lockstat.c index 9b3f7d7d32ef6..b8d12ac77d0ed 100644 --- a/sys/cddl/dev/lockstat/lockstat.c +++ b/sys/cddl/dev/lockstat/lockstat.c @@ -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> diff --git a/sys/cddl/dev/sdt/sdt.c b/sys/cddl/dev/sdt/sdt.c index 52a0898b3e389..6f0660dd48bd6 100644 --- a/sys/cddl/dev/sdt/sdt.c +++ b/sys/cddl/dev/sdt/sdt.c @@ -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> diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index 61156ba0d5d30..ec19cd9e74b0d 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c index 210363635e9ab..316cf2a61ebb5 100644 --- a/sys/compat/linux/linux_fork.c +++ b/sys/compat/linux/linux_fork.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index 9b4c92fdc6ced..82a2ef353f78e 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -38,7 +38,6 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $") #endif #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c index 323a38faf970c..3b75307337dbb 100644 --- a/sys/compat/linux/linux_mib.c +++ b/sys/compat/linux/linux_mib.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index ac2384cd0b059..01073f45ff4d2 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/blist.h> diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index decd8f88b4ea1..7d263df8616b2 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index e03af00f99609..be6e169b26c95 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp #endif #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c index a2c3214085f9d..c5bf2ddb4f79e 100644 --- a/sys/compat/linux/linux_uid16.c +++ b/sys/compat/linux/linux_uid16.c @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/fcntl.h> #include <sys/param.h> diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index 76c210c591fef..be52459c4b84e 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/bus.h> diff --git a/sys/conf/options b/sys/conf/options index 642064d1eb419..61c6e19beffbc 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -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 diff --git a/sys/dev/sfxge/common/efsys.h b/sys/dev/sfxge/common/efsys.h index 18456d51ef1e2..8fd126735b9ea 100644 --- a/sys/dev/sfxge/common/efsys.h +++ b/sys/dev/sfxge/common/efsys.h @@ -270,7 +270,7 @@ typedef struct __efsys_identifier_s efsys_identifier_t; /* PROBE */ -#ifndef KDTRACE_HOOKS +#ifndef DTRACE_PROBE #define EFSYS_PROBE(_name) @@ -295,7 +295,7 @@ typedef struct __efsys_identifier_s efsys_identifier_t; _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_identifier_t; _type6, _arg6) #endif -#endif /* KDTRACE_HOOKS */ +#endif /* DTRACE_PROBE */ /* DMA */ diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c index 21fbb41f77fa9..1c0022726b002 100644 --- a/sys/dev/xen/blkback/blkback.c +++ b/sys/dev/xen/blkback/blkback.c @@ -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> diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index bdba851546e73..0104c2928f909 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); * Socket operations for use by nfs */ -#include "opt_kdtrace.h" #include "opt_kgssapi.h" #include "opt_nfs.h" diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c index 47c2f35725129..42421adbb7002 100644 --- a/sys/fs/nfsclient/nfs_clbio.c +++ b/sys/fs/nfsclient/nfs_clbio.c @@ -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> diff --git a/sys/fs/nfsclient/nfs_clnode.c b/sys/fs/nfsclient/nfs_clnode.c index 0cd503cc0e5e9..5052261ed8602 100644 --- a/sys/fs/nfsclient/nfs_clnode.c +++ b/sys/fs/nfsclient/nfs_clnode.c @@ -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> diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index b198d59769829..0b85353c5288a 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" -#include "opt_kdtrace.h" #include <sys/capability.h> diff --git a/sys/fs/nfsclient/nfs_clsubs.c b/sys/fs/nfsclient/nfs_clsubs.c index 1629cf36d0765..cf21ef97a1166 100644 --- a/sys/fs/nfsclient/nfs_clsubs.c +++ b/sys/fs/nfsclient/nfs_clsubs.c @@ -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 diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 944873c6364ad..73616d3986669 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -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> diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s index 58cd3e8c66121..39a8828e10ab3 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.s @@ -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> diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 763e59b78ac84..4f001a585101a 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -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> diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index f9a5bff53bc0d..884e0f057af13 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -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" diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c index ab77790c3e5b2..85d40f0e09115 100644 --- a/sys/i386/linux/linux_dummy.c +++ b/sys/i386/linux/linux_dummy.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 4cfd219590b85..99de8dbe872e2 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -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" diff --git a/sys/kern/kern_clocksource.c b/sys/kern/kern_clocksource.c index c2bebbeeb9561..0aa71bd73726b 100644 --- a/sys/kern/kern_clocksource.c +++ b/sys/kern/kern_clocksource.c @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); */ #include "opt_device_polling.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index c71c66607da05..1a668145a8a93 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -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" diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 1a68bf5e9fe01..ab2610d7e4682 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_procdesc.h" diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index de7f09fd6ca6e..11160ce4d51f9 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -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" diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index 8ca8acd130c82..5b6910656746e 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -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$"); diff --git a/sys/kern/kern_lockstat.c b/sys/kern/kern_lockstat.c index 1f3589331f58e..1c773128da99a 100644 --- a/sys/kern/kern_lockstat.c +++ b/sys/kern/kern_lockstat.c @@ -32,8 +32,6 @@ * */ -#include "opt_kdtrace.h" - #ifdef KDTRACE_HOOKS #include <sys/time.h> diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index a5d25ea550328..464cbad798727 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_kdtrace.h" #include "opt_vm.h" #include <sys/param.h> diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index e61a187319f90..d0b47e5374b8d 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -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, const char *file, int line) 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--; } diff --git a/sys/kern/kern_priv.c b/sys/kern/kern_priv.c index 4d266ab3ecc18..a1e977f02f975 100644 --- a/sys/kern/kern_priv.c +++ b/sys/kern/kern_priv.c @@ -28,8 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_kdtrace.h" - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 9968e76390192..ece250afad5f6 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -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" diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c index d31c8328a5941..012429a7e572a 100644 --- a/sys/kern/kern_racct.c +++ b/sys/kern/kern_racct.c @@ -32,7 +32,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_sched.h" #include <sys/param.h> diff --git a/sys/kern/kern_rmlock.c b/sys/kern/kern_rmlock.c index ec0e7fa5fd8cb..d93aa158461a3 100644 --- a/sys/kern/kern_rmlock.c +++ b/sys/kern/kern_rmlock.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index 7b1e6bfba5e14..0e9f3a53920ba 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -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 char *file, int line) 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--; } diff --git a/sys/kern/kern_sdt.c b/sys/kern/kern_sdt.c index c8e1940fbd711..460944de0dfc5 100644 --- a/sys/kern/kern_sdt.c +++ b/sys/kern/kern_sdt.c @@ -25,8 +25,6 @@ * $FreeBSD$ */ -#include "opt_kdtrace.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/sdt.h> diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index ea4ac261470e9..7f0c820231795 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -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" diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index a1fc36a9f3ddd..8154b20c494e6 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -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 line) 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 line) 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--; } diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 047fa46a630b2..198f9057ba5bd 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -37,7 +37,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_sched.h" diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 5da4866d6387e..f3271aff7985d 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -27,7 +27,6 @@ */ #include "opt_witness.h" -#include "opt_kdtrace.h" #include "opt_hwpmc_hooks.h" #include <sys/cdefs.h> diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 98a6df339f66b..c925dfc813e1d 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_callout_profiling.h" -#include "opt_kdtrace.h" #if defined(__arm__) #include "opt_timer.h" #endif diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 7c7d48118e52a..7b9a1a68a0fec 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -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> diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index cba9d804a3abf..5e6d35811de86 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_sched.h" #include <sys/param.h> diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c index f5cb27fb85f2b..7cb2ed006f1ed 100644 --- a/sys/kern/subr_devstat.c +++ b/sys/kern/subr_devstat.c @@ -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> diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c index 92b51477e09dd..c385b319f81ca 100644 --- a/sys/kern/subr_sleepqueue.c +++ b/sys/kern/subr_sleepqueue.c @@ -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> diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index 3d6dc5ad90668..c06661eb890d4 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -40,7 +40,6 @@ #include "opt_capsicum.h" #include "opt_ktrace.h" -#include "opt_kdtrace.h" __FBSDID("$FreeBSD$"); diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 19729a46356ca..65a31cdaeec80 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -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> diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c index 0a21ad929496f..6d0341c86f8c2 100644 --- a/sys/kern/subr_turnstile.c +++ b/sys/kern/subr_turnstile.c @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_kdtrace.h" #include "opt_turnstile_profiling.h" #include "opt_sched.h" diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 31ed545c495e7..b931ed72721b3 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -35,7 +35,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include <sys/param.h> diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index fbca5d8f7a329..99bd77656858f 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include <sys/param.h> diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 4b82df8d7ef5e..ee068731d41e8 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -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> diff --git a/sys/mips/mips/exception.S b/sys/mips/mips/exception.S index 28d3cf1f1d4bb..6eddd19af8829 100644 --- a/sys/mips/mips/exception.S +++ b/sys/mips/mips/exception.S @@ -55,7 +55,7 @@ */ #include "opt_ddb.h" -#include "opt_kdtrace.h" + #include <machine/asm.h> #include <machine/cpu.h> #include <machine/regnum.h> diff --git a/sys/mips/mips/trap.c b/sys/mips/mips/trap.c index 9e1f9b8937b41..80955307bcc72 100644 --- a/sys/mips/mips/trap.c +++ b/sys/mips/mips/trap.c @@ -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> diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index bf7c566f133e3..08b9ed6661934 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -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> diff --git a/sys/modules/ctl/Makefile b/sys/modules/ctl/Makefile index 39a61f612efc9..08cd639db2447 100644 --- a/sys/modules/ctl/Makefile +++ b/sys/modules/ctl/Makefile @@ -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 diff --git a/sys/modules/dtrace/dtrace_test/Makefile b/sys/modules/dtrace/dtrace_test/Makefile index c5bb169d42bd7..9725ad9f9a24b 100644 --- a/sys/modules/dtrace/dtrace_test/Makefile +++ b/sys/modules/dtrace/dtrace_test/Makefile @@ -5,7 +5,6 @@ KMOD= dtrace_test SRCS= dtrace_test.c -SRCS+= opt_kdtrace.h SRCS+= vnode_if.h CFLAGS+= -I${.CURDIR}/../../.. diff --git a/sys/modules/dtrace/lockstat/Makefile b/sys/modules/dtrace/lockstat/Makefile index c87a65ab804b4..11b695a291b7f 100644 --- a/sys/modules/dtrace/lockstat/Makefile +++ b/sys/modules/dtrace/lockstat/Makefile @@ -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 \ diff --git a/sys/modules/dtrace/sdt/Makefile b/sys/modules/dtrace/sdt/Makefile index d50999a4e9a5a..96605e1115220 100644 --- a/sys/modules/dtrace/sdt/Makefile +++ b/sys/modules/dtrace/sdt/Makefile @@ -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 \ diff --git a/sys/modules/ip6_mroute_mod/Makefile b/sys/modules/ip6_mroute_mod/Makefile index eb1c82395b008..943f9ab923684 100644 --- a/sys/modules/ip6_mroute_mod/Makefile +++ b/sys/modules/ip6_mroute_mod/Makefile @@ -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: diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 7ed6e989388f4..f79ad1b7a1c05 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -13,8 +13,8 @@ SRCS= linux_fork.c linux${SFX}_dummy.c linux_emul.c linux_file.c \ 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 diff --git a/sys/modules/nfscl/Makefile b/sys/modules/nfscl/Makefile index a9b20038cfeb8..ba78d05d4451b 100644 --- a/sys/modules/nfscl/Makefile +++ b/sys/modules/nfscl/Makefile @@ -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 \ diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile index 94d473b930dbd..aaa6a04449d5e 100644 --- a/sys/modules/nfsclient/Makefile +++ b/sys/modules/nfsclient/Makefile @@ -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 diff --git a/sys/modules/nfscommon/Makefile b/sys/modules/nfscommon/Makefile index 2a6b8f775933b..18a343e7cf0c3 100644 --- a/sys/modules/nfscommon/Makefile +++ b/sys/modules/nfscommon/Makefile @@ -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 diff --git a/sys/modules/send/Makefile b/sys/modules/send/Makefile index 06ea9e0d1eab1..1cb976b9b8d86 100644 --- a/sys/modules/send/Makefile +++ b/sys/modules/send/Makefile @@ -2,6 +2,6 @@ .PATH: ${.CURDIR}/../../netinet6 KMOD= send -SRCS= send.c opt_kdtrace.h +SRCS= send.c .include <bsd.kmod.mk> diff --git a/sys/net/vnet.c b/sys/net/vnet.c index e8864aac0cd5b..4b975a302979d 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -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> diff --git a/sys/netinet/in_kdtrace.c b/sys/netinet/in_kdtrace.c index fc39e4396deae..c17c9f32449fe 100644 --- a/sys/netinet/in_kdtrace.c +++ b/sys/netinet/in_kdtrace.c @@ -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> diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c index 7d8147566cd9d..3f92cd7fa5f36 100644 --- a/sys/netinet/ip_fastfwd.c +++ b/sys/netinet/ip_fastfwd.c @@ -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> diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 4fe52d5721cc8..01ec61762b70f 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -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> diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 1ee18aa152f2b..6d746ac48a999 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -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" diff --git a/sys/netinet/sctp_dtrace_declare.h b/sys/netinet/sctp_dtrace_declare.h index 930a547c57817..c5c8f9ce1618d 100644 --- a/sys/netinet/sctp_dtrace_declare.h +++ b/sys/netinet/sctp_dtrace_declare.h @@ -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> diff --git a/sys/netinet/sctp_dtrace_define.h b/sys/netinet/sctp_dtrace_define.h index c460c0bf349f7..f4f075e25c8dc 100644 --- a/sys/netinet/sctp_dtrace_define.h +++ b/sys/netinet/sctp_dtrace_define.h @@ -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> diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 0f785f97806a6..ce9d74a504d2b 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -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> diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 00d541596b026..2fc4e8620c86f 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -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> diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 170482a6fe613..10306304ea9be 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -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> diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index fe115c3d34bf2..47f1515a56ba3 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -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> diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 4521583202108..dae52afb116dd 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -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> diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 076131309984d..a9686ec2f9f98 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -82,7 +82,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/callout.h> diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index ccfef575c5b2e..188e63a426ef4 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -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> diff --git a/sys/netinet6/send.c b/sys/netinet6/send.c index aa6ec673fcd55..79748387b6625 100644 --- a/sys/netinet6/send.c +++ b/sys/netinet6/send.c @@ -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> diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 469d53a6e0e36..96510652d8f53 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -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> diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index 630a7ffe59319..1f07b4696c9ce 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -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> diff --git a/sys/nfsclient/nfs_krpc.c b/sys/nfsclient/nfs_krpc.c index d3082d8d914fa..f88e47f4f4e85 100644 --- a/sys/nfsclient/nfs_krpc.c +++ b/sys/nfsclient/nfs_krpc.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); */ #include "opt_inet6.h" -#include "opt_kdtrace.h" #include "opt_kgssapi.h" #include <sys/param.h> diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index 5dfab1ca87818..d4fd5eb023860 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -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> diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index d703a8af754b2..a841f65dc96c4 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); */ #include "opt_inet.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c index 53c11e648fac3..889e8555e4ce7 100644 --- a/sys/opencrypto/crypto.c +++ b/sys/opencrypto/crypto.c @@ -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> diff --git a/sys/opencrypto/deflate.c b/sys/opencrypto/deflate.c index deaf05273444b..cf3a5b1a80118 100644 --- a/sys/opencrypto/deflate.c +++ b/sys/opencrypto/deflate.c @@ -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> diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index a4887c6a47ddf..aec04c04fce34 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -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> diff --git a/sys/powerpc/aim/locore32.S b/sys/powerpc/aim/locore32.S index c1ac26c8d56c5..8cee6654b2e01 100644 --- a/sys/powerpc/aim/locore32.S +++ b/sys/powerpc/aim/locore32.S @@ -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 diff --git a/sys/powerpc/aim/locore64.S b/sys/powerpc/aim/locore64.S index 3b3c8f3894550..65c4999a1e2d5 100644 --- a/sys/powerpc/aim/locore64.S +++ b/sys/powerpc/aim/locore64.S @@ -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 diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c index 32833a50dd037..052e5a9e4786f 100644 --- a/sys/powerpc/aim/trap.c +++ b/sys/powerpc/aim/trap.c @@ -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> diff --git a/sys/security/mac/mac_audit.c b/sys/security/mac/mac_audit.c index 4d453b5c83cd8..1cc571da834b9 100644 --- a/sys/security/mac/mac_audit.c +++ b/sys/security/mac/mac_audit.c @@ -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> diff --git a/sys/security/mac/mac_cred.c b/sys/security/mac/mac_cred.c index 64dab5bc3cef0..372679b5e8335 100644 --- a/sys/security/mac/mac_cred.c +++ b/sys/security/mac/mac_cred.c @@ -46,7 +46,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index 25ffa9195ba4b..5fa2736a896c1 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -66,7 +66,6 @@ * src/sys/security/mac_*. */ -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/cdefs.h> diff --git a/sys/security/mac/mac_inet.c b/sys/security/mac/mac_inet.c index 5753bb6246fea..a1bbea9caeba6 100644 --- a/sys/security/mac/mac_inet.c +++ b/sys/security/mac/mac_inet.c @@ -45,7 +45,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index b7e4c54fc8449..5a87f47766bc9 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -45,7 +45,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index 91c3cff4ce94c..d7cb86c1284d4 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -40,7 +40,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_posix_sem.c b/sys/security/mac/mac_posix_sem.c index 461e5dbd3418a..4cf4109b953f1 100644 --- a/sys/security/mac/mac_posix_sem.c +++ b/sys/security/mac/mac_posix_sem.c @@ -39,7 +39,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include "opt_posix.h" diff --git a/sys/security/mac/mac_posix_shm.c b/sys/security/mac/mac_posix_shm.c index 15b298d82d026..f094f06636352 100644 --- a/sys/security/mac/mac_posix_shm.c +++ b/sys/security/mac/mac_posix_shm.c @@ -39,7 +39,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_priv.c b/sys/security/mac/mac_priv.c index 537c00288298b..5d39568ccc4fb 100644 --- a/sys/security/mac/mac_priv.c +++ b/sys/security/mac/mac_priv.c @@ -38,7 +38,6 @@ #include "sys/cdefs.h" __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index 1a760cf629a42..b0a880707c55e 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -45,7 +45,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_socket.c b/sys/security/mac/mac_socket.c index 11d5e05d43e8b..95cfc6b060239 100644 --- a/sys/security/mac/mac_socket.c +++ b/sys/security/mac/mac_socket.c @@ -45,7 +45,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index b705bbd2d3af9..f3da0479ef8ae 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -53,7 +53,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_sysv_msg.c b/sys/security/mac/mac_sysv_msg.c index c40232290857e..6dcd2620840f2 100644 --- a/sys/security/mac/mac_sysv_msg.c +++ b/sys/security/mac/mac_sysv_msg.c @@ -41,7 +41,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_sysv_sem.c b/sys/security/mac/mac_sysv_sem.c index 12e7cce12c35e..f050ddd2347da 100644 --- a/sys/security/mac/mac_sysv_sem.c +++ b/sys/security/mac/mac_sysv_sem.c @@ -40,7 +40,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_sysv_shm.c b/sys/security/mac/mac_sysv_shm.c index 168e5b689f932..a5861d0f31bf7 100644 --- a/sys/security/mac/mac_sysv_shm.c +++ b/sys/security/mac/mac_sysv_shm.c @@ -40,7 +40,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index 05f49c273e749..1d08f61b1a189 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -45,7 +45,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h index 1c9d5d5300289..39d8f45a57aff 100644 --- a/sys/sys/mutex.h +++ b/sys/sys/mutex.h @@ -229,6 +229,9 @@ void thread_lock_flags_(struct thread *, int, const char *, int); #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) diff --git a/sys/sys/rwlock.h b/sys/sys/rwlock.h index 26e4ac7b43d60..a32734087210a 100644 --- a/sys/sys/rwlock.h +++ b/sys/sys/rwlock.h @@ -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) /* diff --git a/sys/sys/sx.h b/sys/sys/sx.h index 01d71126b01a2..8e4a64468083c 100644 --- a/sys/sys/sx.h +++ b/sys/sys/sx.h @@ -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, const char *file, int line) { 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 line) { 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); diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk index 2347004beb67e..c7e1970f51a12 100644 --- a/sys/tools/vnode_if.awk +++ b/sys/tools/vnode_if.awk @@ -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" \ diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 8c8eef6450df6..ec26591757040 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_atpic.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_ddb.h" |