svn commit: r258541 - in head/sys: amd64/amd64 amd64/linux32 cam/ctl cddl/dev/dtrace cddl/dev/lockstat cddl/dev/sdt compat/linux conf dev/sfxge/common dev/xen/blkback fs/nfs fs/nfsclient i386/i386 ...
Attilio Rao
attilio at FreeBSD.org
Mon Nov 25 07:39:05 UTC 2013
Author: attilio
Date: Mon Nov 25 07:38:45 2013
New Revision: 258541
URL: http://svnweb.freebsd.org/changeset/base/258541
Log:
- For kernel compiled only with KDTRACE_HOOKS and not any lock debugging
option, unbreak the lock tracing release semantic by embedding
calls to LOCKSTAT_PROFILE_RELEASE_LOCK() direclty in the inlined
version of the releasing functions for mutex, rwlock and sxlock.
Failing to do so skips the lockstat_probe_func invokation for
unlocking.
- As part of the LOCKSTAT support is inlined in mutex operation, for
kernel compiled without lock debugging options, potentially every
consumer must be compiled including opt_kdtrace.h.
Fix this by moving KDTRACE_HOOKS into opt_global.h and remove the
dependency by opt_kdtrace.h for all files, as now only KDTRACE_FRAMES
is linked there and it is only used as a compile-time stub [0].
[0] immediately shows some new bug as DTRACE-derived support for debug
in sfxge is broken and it was never really tested. As it was not
including correctly opt_kdtrace.h before it was never enabled so it
was kept broken for a while. Fix this by using a protection stub,
leaving sfxge driver authors the responsibility for fixing it
appropriately [1].
Sponsored by: EMC / Isilon storage division
Discussed with: rstone
[0] Reported by: rstone
[1] Discussed with: philip
Modified:
head/sys/amd64/amd64/exception.S
head/sys/amd64/amd64/machdep.c
head/sys/amd64/amd64/trap.c
head/sys/amd64/linux32/linux32_dummy.c
head/sys/cam/ctl/ctl_backend_block.c
head/sys/cddl/dev/dtrace/dtrace_test.c
head/sys/cddl/dev/lockstat/lockstat.c
head/sys/cddl/dev/sdt/sdt.c
head/sys/compat/linux/linux_emul.c
head/sys/compat/linux/linux_fork.c
head/sys/compat/linux/linux_futex.c
head/sys/compat/linux/linux_mib.c
head/sys/compat/linux/linux_misc.c
head/sys/compat/linux/linux_sysctl.c
head/sys/compat/linux/linux_time.c
head/sys/compat/linux/linux_uid16.c
head/sys/compat/linux/linux_util.c
head/sys/conf/options
head/sys/dev/sfxge/common/efsys.h
head/sys/dev/xen/blkback/blkback.c
head/sys/fs/nfs/nfs_commonkrpc.c
head/sys/fs/nfsclient/nfs_clbio.c
head/sys/fs/nfsclient/nfs_clnode.c
head/sys/fs/nfsclient/nfs_clport.c
head/sys/fs/nfsclient/nfs_clsubs.c
head/sys/fs/nfsclient/nfs_clvnops.c
head/sys/i386/i386/exception.s
head/sys/i386/i386/machdep.c
head/sys/i386/i386/trap.c
head/sys/i386/linux/linux_dummy.c
head/sys/kern/kern_clock.c
head/sys/kern/kern_clocksource.c
head/sys/kern/kern_exec.c
head/sys/kern/kern_exit.c
head/sys/kern/kern_fork.c
head/sys/kern/kern_lock.c
head/sys/kern/kern_lockstat.c
head/sys/kern/kern_malloc.c
head/sys/kern/kern_mutex.c
head/sys/kern/kern_priv.c
head/sys/kern/kern_proc.c
head/sys/kern/kern_racct.c
head/sys/kern/kern_rmlock.c
head/sys/kern/kern_rwlock.c
head/sys/kern/kern_sdt.c
head/sys/kern/kern_sig.c
head/sys/kern/kern_sx.c
head/sys/kern/kern_synch.c
head/sys/kern/kern_thread.c
head/sys/kern/kern_timeout.c
head/sys/kern/sched_4bsd.c
head/sys/kern/sched_ule.c
head/sys/kern/subr_devstat.c
head/sys/kern/subr_sleepqueue.c
head/sys/kern/subr_syscall.c
head/sys/kern/subr_trap.c
head/sys/kern/subr_turnstile.c
head/sys/kern/vfs_cache.c
head/sys/kern/vfs_lookup.c
head/sys/kern/vfs_syscalls.c
head/sys/mips/mips/exception.S
head/sys/mips/mips/trap.c
head/sys/modules/crypto/Makefile
head/sys/modules/ctl/Makefile
head/sys/modules/dtrace/dtrace_test/Makefile
head/sys/modules/dtrace/lockstat/Makefile
head/sys/modules/dtrace/sdt/Makefile
head/sys/modules/ip6_mroute_mod/Makefile
head/sys/modules/linux/Makefile
head/sys/modules/nfscl/Makefile
head/sys/modules/nfsclient/Makefile
head/sys/modules/nfscommon/Makefile
head/sys/modules/send/Makefile
head/sys/net/vnet.c
head/sys/netinet/in_kdtrace.c
head/sys/netinet/ip_fastfwd.c
head/sys/netinet/ip_input.c
head/sys/netinet/ip_output.c
head/sys/netinet/sctp_dtrace_declare.h
head/sys/netinet/sctp_dtrace_define.h
head/sys/netinet/tcp_input.c
head/sys/netinet/tcp_output.c
head/sys/netinet/tcp_subr.c
head/sys/netinet/udp_usrreq.c
head/sys/netinet6/ip6_input.c
head/sys/netinet6/ip6_mroute.c
head/sys/netinet6/nd6.c
head/sys/netinet6/send.c
head/sys/netinet6/udp6_usrreq.c
head/sys/nfsclient/nfs_bio.c
head/sys/nfsclient/nfs_krpc.c
head/sys/nfsclient/nfs_subs.c
head/sys/nfsclient/nfs_vnops.c
head/sys/opencrypto/crypto.c
head/sys/opencrypto/deflate.c
head/sys/pc98/pc98/machdep.c
head/sys/powerpc/aim/locore32.S
head/sys/powerpc/aim/locore64.S
head/sys/powerpc/aim/trap.c
head/sys/security/mac/mac_audit.c
head/sys/security/mac/mac_cred.c
head/sys/security/mac/mac_framework.c
head/sys/security/mac/mac_inet.c
head/sys/security/mac/mac_net.c
head/sys/security/mac/mac_pipe.c
head/sys/security/mac/mac_posix_sem.c
head/sys/security/mac/mac_posix_shm.c
head/sys/security/mac/mac_priv.c
head/sys/security/mac/mac_process.c
head/sys/security/mac/mac_socket.c
head/sys/security/mac/mac_system.c
head/sys/security/mac/mac_sysv_msg.c
head/sys/security/mac/mac_sysv_sem.c
head/sys/security/mac/mac_sysv_shm.c
head/sys/security/mac/mac_vfs.c
head/sys/sys/mutex.h
head/sys/sys/rwlock.h
head/sys/sys/sx.h
head/sys/tools/vnode_if.awk
head/sys/x86/x86/local_apic.c
Modified: head/sys/amd64/amd64/exception.S
==============================================================================
--- head/sys/amd64/amd64/exception.S Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/amd64/amd64/exception.S Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/amd64/amd64/machdep.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/amd64/amd64/trap.c
==============================================================================
--- head/sys/amd64/amd64/trap.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/amd64/amd64/trap.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/amd64/linux32/linux32_dummy.c
==============================================================================
--- head/sys/amd64/linux32/linux32_dummy.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/amd64/linux32/linux32_dummy.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -30,7 +30,6 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/kernel.h>
Modified: head/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- head/sys/cam/ctl/ctl_backend_block.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/cam/ctl/ctl_backend_block.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/cddl/dev/dtrace/dtrace_test.c
==============================================================================
--- head/sys/cddl/dev/dtrace/dtrace_test.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/cddl/dev/dtrace/dtrace_test.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -25,8 +25,6 @@
* $FreeBSD$
*
*/
-#include "opt_kdtrace.h"
-
#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/param.h>
Modified: head/sys/cddl/dev/lockstat/lockstat.c
==============================================================================
--- head/sys/cddl/dev/lockstat/lockstat.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/cddl/dev/lockstat/lockstat.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/cddl/dev/sdt/sdt.c
==============================================================================
--- head/sys/cddl/dev/sdt/sdt.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/cddl/dev/sdt/sdt.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/compat/linux/linux_emul.c
==============================================================================
--- head/sys/compat/linux/linux_emul.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/compat/linux/linux_emul.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -30,7 +30,6 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/systm.h>
Modified: head/sys/compat/linux/linux_fork.c
==============================================================================
--- head/sys/compat/linux/linux_fork.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/compat/linux/linux_fork.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -30,7 +30,6 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/systm.h>
Modified: head/sys/compat/linux/linux_futex.c
==============================================================================
--- head/sys/compat/linux/linux_futex.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/compat/linux/linux_futex.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -38,7 +38,6 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex.
#endif
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/systm.h>
Modified: head/sys/compat/linux/linux_mib.c
==============================================================================
--- head/sys/compat/linux/linux_mib.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/compat/linux/linux_mib.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -30,7 +30,6 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/kernel.h>
Modified: head/sys/compat/linux/linux_misc.c
==============================================================================
--- head/sys/compat/linux/linux_misc.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/compat/linux/linux_misc.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -31,7 +31,6 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/blist.h>
Modified: head/sys/compat/linux/linux_sysctl.c
==============================================================================
--- head/sys/compat/linux/linux_sysctl.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/compat/linux/linux_sysctl.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -30,7 +30,6 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/kernel.h>
Modified: head/sys/compat/linux/linux_time.c
==============================================================================
--- head/sys/compat/linux/linux_time.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/compat/linux/linux_time.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c
#endif
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/kernel.h>
Modified: head/sys/compat/linux/linux_uid16.c
==============================================================================
--- head/sys/compat/linux/linux_uid16.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/compat/linux/linux_uid16.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -28,7 +28,6 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include <sys/fcntl.h>
#include <sys/param.h>
Modified: head/sys/compat/linux/linux_util.c
==============================================================================
--- head/sys/compat/linux/linux_util.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/compat/linux/linux_util.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -33,7 +33,6 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/bus.h>
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/conf/options Mon Nov 25 07:38:45 2013 (r258541)
@@ -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
Modified: head/sys/dev/sfxge/common/efsys.h
==============================================================================
--- head/sys/dev/sfxge/common/efsys.h Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/dev/sfxge/common/efsys.h Mon Nov 25 07:38:45 2013 (r258541)
@@ -270,7 +270,7 @@ typedef struct __efsys_identifier_s efsy
/* PROBE */
-#ifndef KDTRACE_HOOKS
+#ifndef DTRACE_PROBE
#define EFSYS_PROBE(_name)
@@ -295,7 +295,7 @@ typedef struct __efsys_identifier_s efsy
_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 efsy
_type6, _arg6)
#endif
-#endif /* KDTRACE_HOOKS */
+#endif /* DTRACE_PROBE */
/* DMA */
Modified: head/sys/dev/xen/blkback/blkback.c
==============================================================================
--- head/sys/dev/xen/blkback/blkback.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/dev/xen/blkback/blkback.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonkrpc.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/fs/nfs/nfs_commonkrpc.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
* Socket operations for use by nfs
*/
-#include "opt_kdtrace.h"
#include "opt_kgssapi.h"
#include "opt_nfs.h"
Modified: head/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clbio.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/fs/nfsclient/nfs_clbio.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/fs/nfsclient/nfs_clnode.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clnode.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/fs/nfsclient/nfs_clnode.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clport.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/fs/nfsclient/nfs_clport.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -35,7 +35,6 @@
__FBSDID("$FreeBSD$");
#include "opt_inet6.h"
-#include "opt_kdtrace.h"
#include <sys/capability.h>
Modified: head/sys/fs/nfsclient/nfs_clsubs.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clsubs.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/fs/nfsclient/nfs_clsubs.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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
Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/fs/nfsclient/nfs_clvnops.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/i386/i386/exception.s
==============================================================================
--- head/sys/i386/i386/exception.s Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/i386/i386/exception.s Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/i386/i386/machdep.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/i386/i386/trap.c
==============================================================================
--- head/sys/i386/i386/trap.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/i386/i386/trap.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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"
Modified: head/sys/i386/linux/linux_dummy.c
==============================================================================
--- head/sys/i386/linux/linux_dummy.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/i386/linux/linux_dummy.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -30,7 +30,6 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/kernel.h>
Modified: head/sys/kern/kern_clock.c
==============================================================================
--- head/sys/kern/kern_clock.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_clock.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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"
Modified: head/sys/kern/kern_clocksource.c
==============================================================================
--- head/sys/kern/kern_clocksource.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_clocksource.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
*/
#include "opt_device_polling.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/systm.h>
Modified: head/sys/kern/kern_exec.c
==============================================================================
--- head/sys/kern/kern_exec.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_exec.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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"
Modified: head/sys/kern/kern_exit.c
==============================================================================
--- head/sys/kern/kern_exit.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_exit.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -38,7 +38,6 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
-#include "opt_kdtrace.h"
#include "opt_ktrace.h"
#include "opt_procdesc.h"
Modified: head/sys/kern/kern_fork.c
==============================================================================
--- head/sys/kern/kern_fork.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_fork.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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"
Modified: head/sys/kern/kern_lock.c
==============================================================================
--- head/sys/kern/kern_lock.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_lock.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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$");
Modified: head/sys/kern/kern_lockstat.c
==============================================================================
--- head/sys/kern/kern_lockstat.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_lockstat.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -32,8 +32,6 @@
*
*/
-#include "opt_kdtrace.h"
-
#ifdef KDTRACE_HOOKS
#include <sys/time.h>
Modified: head/sys/kern/kern_malloc.c
==============================================================================
--- head/sys/kern/kern_malloc.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_malloc.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -46,7 +46,6 @@
__FBSDID("$FreeBSD$");
#include "opt_ddb.h"
-#include "opt_kdtrace.h"
#include "opt_vm.h"
#include <sys/param.h>
Modified: head/sys/kern/kern_mutex.c
==============================================================================
--- head/sys/kern/kern_mutex.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_mutex.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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
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--;
}
Modified: head/sys/kern/kern_priv.c
==============================================================================
--- head/sys/kern/kern_priv.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_priv.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -28,8 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_kdtrace.h"
-
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
Modified: head/sys/kern/kern_proc.c
==============================================================================
--- head/sys/kern/kern_proc.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_proc.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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"
Modified: head/sys/kern/kern_racct.c
==============================================================================
--- head/sys/kern/kern_racct.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_racct.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -32,7 +32,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_kdtrace.h"
#include "opt_sched.h"
#include <sys/param.h>
Modified: head/sys/kern/kern_rmlock.c
==============================================================================
--- head/sys/kern/kern_rmlock.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_rmlock.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -35,7 +35,6 @@
__FBSDID("$FreeBSD$");
#include "opt_ddb.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/systm.h>
Modified: head/sys/kern/kern_rwlock.c
==============================================================================
--- head/sys/kern/kern_rwlock.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_rwlock.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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
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--;
}
Modified: head/sys/kern/kern_sdt.c
==============================================================================
--- head/sys/kern/kern_sdt.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_sdt.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -25,8 +25,6 @@
* $FreeBSD$
*/
-#include "opt_kdtrace.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sdt.h>
Modified: head/sys/kern/kern_sig.c
==============================================================================
--- head/sys/kern/kern_sig.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_sig.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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"
Modified: head/sys/kern/kern_sx.c
==============================================================================
--- head/sys/kern/kern_sx.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_sx.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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 *f
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 *f
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--;
}
Modified: head/sys/kern/kern_synch.c
==============================================================================
--- head/sys/kern/kern_synch.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_synch.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -37,7 +37,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_kdtrace.h"
#include "opt_ktrace.h"
#include "opt_sched.h"
Modified: head/sys/kern/kern_thread.c
==============================================================================
--- head/sys/kern/kern_thread.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_thread.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -27,7 +27,6 @@
*/
#include "opt_witness.h"
-#include "opt_kdtrace.h"
#include "opt_hwpmc_hooks.h"
#include <sys/cdefs.h>
Modified: head/sys/kern/kern_timeout.c
==============================================================================
--- head/sys/kern/kern_timeout.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/kern_timeout.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -38,7 +38,6 @@
__FBSDID("$FreeBSD$");
#include "opt_callout_profiling.h"
-#include "opt_kdtrace.h"
#if defined(__arm__)
#include "opt_timer.h"
#endif
Modified: head/sys/kern/sched_4bsd.c
==============================================================================
--- head/sys/kern/sched_4bsd.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/sched_4bsd.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/kern/sched_ule.c
==============================================================================
--- head/sys/kern/sched_ule.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/sched_ule.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -39,7 +39,6 @@
__FBSDID("$FreeBSD$");
#include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
#include "opt_sched.h"
#include <sys/param.h>
Modified: head/sys/kern/subr_devstat.c
==============================================================================
--- head/sys/kern/subr_devstat.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/subr_devstat.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/kern/subr_sleepqueue.c
==============================================================================
--- head/sys/kern/subr_sleepqueue.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/subr_sleepqueue.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/kern/subr_syscall.c
==============================================================================
--- head/sys/kern/subr_syscall.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/subr_syscall.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -40,7 +40,6 @@
#include "opt_capsicum.h"
#include "opt_ktrace.h"
-#include "opt_kdtrace.h"
__FBSDID("$FreeBSD$");
Modified: head/sys/kern/subr_trap.c
==============================================================================
--- head/sys/kern/subr_trap.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/subr_trap.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/kern/subr_turnstile.c
==============================================================================
--- head/sys/kern/subr_turnstile.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/subr_turnstile.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -60,7 +60,6 @@
__FBSDID("$FreeBSD$");
#include "opt_ddb.h"
-#include "opt_kdtrace.h"
#include "opt_turnstile_profiling.h"
#include "opt_sched.h"
Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/vfs_cache.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -35,7 +35,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_kdtrace.h"
#include "opt_ktrace.h"
#include <sys/param.h>
Modified: head/sys/kern/vfs_lookup.c
==============================================================================
--- head/sys/kern/vfs_lookup.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/vfs_lookup.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -38,7 +38,6 @@
__FBSDID("$FreeBSD$");
#include "opt_capsicum.h"
-#include "opt_kdtrace.h"
#include "opt_ktrace.h"
#include <sys/param.h>
Modified: head/sys/kern/vfs_syscalls.c
==============================================================================
--- head/sys/kern/vfs_syscalls.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/kern/vfs_syscalls.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/mips/mips/exception.S
==============================================================================
--- head/sys/mips/mips/exception.S Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/mips/mips/exception.S Mon Nov 25 07:38:45 2013 (r258541)
@@ -55,7 +55,7 @@
*/
#include "opt_ddb.h"
-#include "opt_kdtrace.h"
+
#include <machine/asm.h>
#include <machine/cpu.h>
#include <machine/regnum.h>
Modified: head/sys/mips/mips/trap.c
==============================================================================
--- head/sys/mips/mips/trap.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/mips/mips/trap.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/modules/crypto/Makefile
==============================================================================
--- head/sys/modules/crypto/Makefile Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/modules/crypto/Makefile Mon Nov 25 07:38:45 2013 (r258541)
@@ -16,6 +16,6 @@ SRCS += skipjack.c bf_enc.c bf_ecb.c bf_
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>
Modified: head/sys/modules/ctl/Makefile
==============================================================================
--- head/sys/modules/ctl/Makefile Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/modules/ctl/Makefile Mon Nov 25 07:38:45 2013 (r258541)
@@ -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
Modified: head/sys/modules/dtrace/dtrace_test/Makefile
==============================================================================
--- head/sys/modules/dtrace/dtrace_test/Makefile Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/modules/dtrace/dtrace_test/Makefile Mon Nov 25 07:38:45 2013 (r258541)
@@ -5,7 +5,6 @@
KMOD= dtrace_test
SRCS= dtrace_test.c
-SRCS+= opt_kdtrace.h
SRCS+= vnode_if.h
CFLAGS+= -I${.CURDIR}/../../..
Modified: head/sys/modules/dtrace/lockstat/Makefile
==============================================================================
--- head/sys/modules/dtrace/lockstat/Makefile Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/modules/dtrace/lockstat/Makefile Mon Nov 25 07:38:45 2013 (r258541)
@@ -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 \
Modified: head/sys/modules/dtrace/sdt/Makefile
==============================================================================
--- head/sys/modules/dtrace/sdt/Makefile Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/modules/dtrace/sdt/Makefile Mon Nov 25 07:38:45 2013 (r258541)
@@ -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 \
Modified: head/sys/modules/ip6_mroute_mod/Makefile
==============================================================================
--- head/sys/modules/ip6_mroute_mod/Makefile Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/modules/ip6_mroute_mod/Makefile Mon Nov 25 07:38:45 2013 (r258541)
@@ -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:
Modified: head/sys/modules/linux/Makefile
==============================================================================
--- head/sys/modules/linux/Makefile Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/modules/linux/Makefile Mon Nov 25 07:38:45 2013 (r258541)
@@ -13,8 +13,8 @@ SRCS= linux_fork.c linux${SFX}_dummy.c l
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
Modified: head/sys/modules/nfscl/Makefile
==============================================================================
--- head/sys/modules/nfscl/Makefile Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/modules/nfscl/Makefile Mon Nov 25 07:38:45 2013 (r258541)
@@ -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 \
Modified: head/sys/modules/nfsclient/Makefile
==============================================================================
--- head/sys/modules/nfsclient/Makefile Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/modules/nfsclient/Makefile Mon Nov 25 07:38:45 2013 (r258541)
@@ -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
Modified: head/sys/modules/nfscommon/Makefile
==============================================================================
--- head/sys/modules/nfscommon/Makefile Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/modules/nfscommon/Makefile Mon Nov 25 07:38:45 2013 (r258541)
@@ -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
Modified: head/sys/modules/send/Makefile
==============================================================================
--- head/sys/modules/send/Makefile Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/modules/send/Makefile Mon Nov 25 07:38:45 2013 (r258541)
@@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../netinet6
KMOD= send
-SRCS= send.c opt_kdtrace.h
+SRCS= send.c
.include <bsd.kmod.mk>
Modified: head/sys/net/vnet.c
==============================================================================
--- head/sys/net/vnet.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/net/vnet.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet/in_kdtrace.c
==============================================================================
--- head/sys/netinet/in_kdtrace.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet/in_kdtrace.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet/ip_fastfwd.c
==============================================================================
--- head/sys/netinet/ip_fastfwd.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet/ip_fastfwd.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet/ip_input.c
==============================================================================
--- head/sys/netinet/ip_input.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet/ip_input.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet/ip_output.c
==============================================================================
--- head/sys/netinet/ip_output.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet/ip_output.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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"
Modified: head/sys/netinet/sctp_dtrace_declare.h
==============================================================================
--- head/sys/netinet/sctp_dtrace_declare.h Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet/sctp_dtrace_declare.h Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet/sctp_dtrace_define.h
==============================================================================
--- head/sys/netinet/sctp_dtrace_define.h Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet/sctp_dtrace_define.h Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet/tcp_input.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet/tcp_output.c
==============================================================================
--- head/sys/netinet/tcp_output.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet/tcp_output.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet/tcp_subr.c
==============================================================================
--- head/sys/netinet/tcp_subr.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet/tcp_subr.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet/udp_usrreq.c
==============================================================================
--- head/sys/netinet/udp_usrreq.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet/udp_usrreq.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet6/ip6_input.c
==============================================================================
--- head/sys/netinet6/ip6_input.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet6/ip6_input.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet6/ip6_mroute.c
==============================================================================
--- head/sys/netinet6/ip6_mroute.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet6/ip6_mroute.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -82,7 +82,6 @@
__FBSDID("$FreeBSD$");
#include "opt_inet6.h"
-#include "opt_kdtrace.h"
#include <sys/param.h>
#include <sys/callout.h>
Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet6/nd6.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet6/send.c
==============================================================================
--- head/sys/netinet6/send.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet6/send.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/netinet6/udp6_usrreq.c
==============================================================================
--- head/sys/netinet6/udp6_usrreq.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/netinet6/udp6_usrreq.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/nfsclient/nfs_bio.c
==============================================================================
--- head/sys/nfsclient/nfs_bio.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/nfsclient/nfs_bio.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -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>
Modified: head/sys/nfsclient/nfs_krpc.c
==============================================================================
--- head/sys/nfsclient/nfs_krpc.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/nfsclient/nfs_krpc.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
*/
#include "opt_inet6.h"
-#include "opt_kdtrace.h"
#include "opt_kgssapi.h"
#include <sys/param.h>
Modified: head/sys/nfsclient/nfs_subs.c
==============================================================================
--- head/sys/nfsclient/nfs_subs.c Mon Nov 25 07:35:01 2013 (r258540)
+++ head/sys/nfsclient/nfs_subs.c Mon Nov 25 07:38:45 2013 (r258541)
@@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$");
* copy data between mbuf chains and uio lists.
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-head
mailing list