Clean up unused or poorly utilized KTR values. Remove KTR_FS, KTR_KGDB,

and KTR_IO as they were never used.  Remove KTR_CLK since it was only
used for hardclock firing and use KTR_INTR there instead.  Remove
KTR_CRITICAL since it was only used for crit enter/exit and use
KTR_CONTENTION instead.

3 files changed, 15 insertions, 15 deletions

diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 3c1a1da..219ee8a 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -237,7 +237,7 @@ hardclock(frame)
 {
 	int need_softclock = 0;
 
-	CTR0(KTR_CLK, "hardclock fired");
+	CTR0(KTR_INTR, "hardclock fired");
 	hardclock_process(frame);
 
 	tc_ticktock();
diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c
index b5c8130..3a5641a 100644
--- a/sys/kern/kern_switch.c
+++ b/sys/kern/kern_switch.c
@@ -597,7 +597,7 @@ critical_enter(void)
 
 	td = curthread;
 	td->td_critnest++;
-	CTR4(KTR_CRITICAL, "critical_enter by thread %p (%ld, %s) to %d", td,
+	CTR4(KTR_CONTENTION, "critical_enter by thread %p (%ld, %s) to %d", td,
 	    (long)td->td_proc->p_pid, td->td_proc->p_comm, td->td_critnest);
 }
 
@@ -625,7 +625,7 @@ critical_exit(void)
 		td->td_critnest--;
 	
 	
-	CTR4(KTR_CRITICAL, "critical_exit by thread %p (%ld, %s) to %d", td,
+	CTR4(KTR_CONTENTION, "critical_exit by thread %p (%ld, %s) to %d", td,
 	    (long)td->td_proc->p_pid, td->td_proc->p_comm, td->td_critnest);
 }
 
diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h
index 9d65460..4a996fc 100644
--- a/sys/sys/ktr.h
+++ b/sys/sys/ktr.h
@@ -44,30 +44,30 @@
 #define	KTR_DEV		0x00000004		/* Device driver */
 #define	KTR_LOCK	0x00000008		/* MP locking */
 #define	KTR_SMP		0x00000010		/* MP general */
-#define	KTR_FS		0x00000020		/* Filesystem */
-#define KTR_PMAP	0x00000040		/* Pmap tracing */
-#define KTR_MALLOC	0x00000080		/* Malloc tracing */
+#define	KTR_SPARE1	0x00000020		/* Unused */
+#define	KTR_PMAP	0x00000040		/* Pmap tracing */
+#define	KTR_MALLOC	0x00000080		/* Malloc tracing */
 #define	KTR_TRAP	0x00000100		/* Trap processing */
 #define	KTR_INTR	0x00000200		/* Interrupt tracing */
-#define KTR_SIG		0x00000400		/* Signal processing */
-#define	KTR_CLK		0x00000800		/* hardclock verbose */
+#define	KTR_SIG		0x00000400		/* Signal processing */
+#define	KTR_SPARE2	0x00000800		/* Unused */
 #define	KTR_PROC	0x00001000		/* Process scheduling */
 #define	KTR_SYSC	0x00002000		/* System call */
 #define	KTR_INIT	0x00004000		/* System initialization */
-#define KTR_KGDB	0x00008000		/* Trace kgdb internals */
-#define	KTR_IO		0x00010000		/* Upper I/O  */
+#define	KTR_SPARE3	0x00008000		/* Unused */
+#define	KTR_SPARE4	0x00010000		/* Unused */
 #define	KTR_EVH		0x00020000		/* Eventhandler */
-#define KTR_VFS		0x00040000		/* VFS events */
-#define KTR_VOP		0x00080000		/* Auto-generated vop events */
-#define KTR_VM		0x00100000		/* The virtual memory system */
-#define KTR_WITNESS	0x00200000
+#define	KTR_VFS		0x00040000		/* VFS events */
+#define	KTR_VOP		0x00080000		/* Auto-generated vop events */
+#define	KTR_VM		0x00100000		/* The virtual memory system */
+#define	KTR_WITNESS	0x00200000
 #define	KTR_RUNQ	0x00400000		/* Run queue */
 #define	KTR_CONTENTION	0x00800000		/* Lock contention */
 #define	KTR_UMA		0x01000000		/* UMA slab allocator */
 #define	KTR_CALLOUT	0x02000000		/* Callouts and timeouts */
 #define	KTR_GEOM	0x04000000		/* GEOM I/O events */
 #define	KTR_BUSDMA	0x08000000		/* busdma(9) events */
-#define	KTR_CRITICAL	0x10000000		/* Critical sections */
+#define	KTR_SPARE5	0x10000000		/* Unused */
 #define	KTR_SCHED	0x20000000		/* Machine parsed sched info. */
 #define	KTR_BUF		0x40000000		/* Buffer cache */
 #define	KTR_ALL		0x7fffffff