diff options
author | jhb <jhb@FreeBSD.org> | 2006-01-25 14:57:23 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2006-01-25 14:57:23 +0000 |
commit | 39a7d62e79ccd2fa262a3ddbb2a398905cccbf59 (patch) | |
tree | 4504428a11c3de77c470e331506329bb2ac2940c /sys | |
parent | e70c09a2e11c97b85bf8e78f854be7f65f8b79b6 (diff) | |
download | FreeBSD-src-39a7d62e79ccd2fa262a3ddbb2a398905cccbf59.zip FreeBSD-src-39a7d62e79ccd2fa262a3ddbb2a398905cccbf59.tar.gz |
Axe KTR_ALQ_MASK now that KTR_WITNESS is off unless you hack an #ifdef
in subr_witness.c. I did add a comment in subr_witness.c noting that
KTR_WITNESS is incompatible with KTR_ALQ.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/kern/kern_ktr.c | 1 | ||||
-rw-r--r-- | sys/kern/subr_witness.c | 1 | ||||
-rw-r--r-- | sys/sys/ktr.h | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c index b6d9098..ad5d8e8 100644 --- a/sys/kern/kern_ktr.c +++ b/sys/kern/kern_ktr.c @@ -148,7 +148,6 @@ sysctl_debug_ktr_alq_enable(SYSCTL_HANDLER_ARGS) req->td->td_ucred, ALQ_DEFAULT_CMODE, sizeof(struct ktr_entry), ktr_alq_depth); if (error == 0) { - ktr_mask &= ~KTR_ALQ_MASK; ktr_alq_cnt = 0; ktr_alq_failed = 0; ktr_alq_enabled = 1; diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index f6eb921..b3a5c5a 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -103,6 +103,7 @@ __FBSDID("$FreeBSD$"); #include <machine/stdarg.h> +/* Note that these traces do not work with KTR_ALQ. */ #if 0 #define KTR_WITNESS KTR_SUBSYS #else diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h index 3d6d98d..5a262db 100644 --- a/sys/sys/ktr.h +++ b/sys/sys/ktr.h @@ -100,9 +100,6 @@ #define KTR_COMPILE 0 #endif /* KTR */ -/* Trace classes that can not be used with KTR_ALQ */ -#define KTR_ALQ_MASK (KTR_WITNESS) - /* * Version number for ktr_entry struct. Increment this when you break binary * compatibility. |