KTR_CTx are long time aliased by existing classes so they can't serve

their purpose anymore. Axe them out.

Sponsored by:	Sandvine Incorporated
Discussed with:	jhb, emaste
Possible MFC:	TBD

8 files changed, 7 insertions, 20 deletions

diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c
index 0840ef1..c3de512 100644
--- a/sys/dev/cas/if_cas.c
+++ b/sys/dev/cas/if_cas.c
@@ -176,7 +176,7 @@ MODULE_DEPEND(cas, miibus, 1, 1, 1);
 
 #ifdef CAS_DEBUG
 #include <sys/ktr.h>
-#define	KTR_CAS		KTR_CT2
+#define	KTR_CAS		KTR_SPARE2
 #endif
 
 static int
diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c
index 7cba6e7..6edb49e 100644
--- a/sys/dev/gem/if_gem.c
+++ b/sys/dev/gem/if_gem.c
@@ -136,7 +136,7 @@ MODULE_DEPEND(gem, miibus, 1, 1, 1);
 
 #ifdef GEM_DEBUG
 #include <sys/ktr.h>
-#define	KTR_GEM		KTR_CT2
+#define	KTR_GEM		KTR_SPARE2
 #endif
 
 #define	GEM_BANK1_BITWAIT(sc, r, clr, set)				\
diff --git a/sys/dev/hme/if_hme.c b/sys/dev/hme/if_hme.c
index d78e8f1..08cef66 100644
--- a/sys/dev/hme/if_hme.c
+++ b/sys/dev/hme/if_hme.c
@@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
 #if 0
 #define HMEDEBUG
 #endif
-#define	KTR_HME		KTR_CT2		/* XXX */
+#define	KTR_HME		KTR_SPARE2	/* XXX */
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sparc64/include/bus.h b/sys/sparc64/include/bus.h
index 631781b..da942b6 100644
--- a/sys/sparc64/include/bus.h
+++ b/sys/sparc64/include/bus.h
@@ -194,7 +194,7 @@ bus_space_subregion(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
 #define	BUS_SPACE_BARRIER_WRITE		0x02	/* force write barrier */
 
 #ifdef BUS_SPACE_DEBUG
-#define	KTR_BUS				KTR_CT2
+#define	KTR_BUS				KTR_SPARE2
 #define	__BUS_DEBUG_ACCESS(h, o, desc, sz) do {				\
 	CTR4(KTR_BUS, "bus space: %s %d: handle %#lx, offset %#lx",	\
 	    (desc), (sz), (h), (o));					\
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index caceb3f..e30d569 100644
--- a/sys/sparc64/sparc64/pmap.c
+++ b/sys/sparc64/sparc64/pmap.c
@@ -899,7 +899,7 @@ pmap_kenter(vm_offset_t va, vm_page_t m)
 	CTR4(KTR_PMAP, "pmap_kenter: va=%#lx pa=%#lx tp=%p data=%#lx",
 	    va, VM_PAGE_TO_PHYS(m), tp, tp->tte_data);
 	if (DCACHE_COLOR(VM_PAGE_TO_PHYS(m)) != DCACHE_COLOR(va)) {
-		CTR5(KTR_CT2,
+		CTR5(KTR_SPARE2,
 	"pmap_kenter: off colour va=%#lx pa=%#lx o=%p ot=%d pi=%#lx",
 		    va, VM_PAGE_TO_PHYS(m), m->object,
 		    m->object ? m->object->type : -1,
diff --git a/sys/sparc64/sparc64/tsb.c b/sys/sparc64/sparc64/tsb.c
index 7de92cd..72206b7 100644
--- a/sys/sparc64/sparc64/tsb.c
+++ b/sys/sparc64/sparc64/tsb.c
@@ -118,7 +118,7 @@ tsb_tte_enter(pmap_t pm, vm_page_t m, vm_offset_t va, u_long sz, u_long data)
 	int i;
 
 	if (DCACHE_COLOR(VM_PAGE_TO_PHYS(m)) != DCACHE_COLOR(va)) {
-		CTR5(KTR_CT2,
+		CTR5(KTR_SPARE2,
 	"tsb_tte_enter: off colour va=%#lx pa=%#lx o=%p ot=%d pi=%#lx",
 		    va, VM_PAGE_TO_PHYS(m), m->object,
 		    m->object ? m->object->type : -1,
diff --git a/sys/sun4v/include/bus.h b/sys/sun4v/include/bus.h
index 02fa634..51a7ea5 100644
--- a/sys/sun4v/include/bus.h
+++ b/sys/sun4v/include/bus.h
@@ -194,7 +194,7 @@ bus_space_subregion(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
 #define	BUS_SPACE_BARRIER_WRITE		0x02	/* force write barrier */
 
 #ifdef BUS_SPACE_DEBUG
-#define	KTR_BUS				KTR_CT2
+#define	KTR_BUS				KTR_SPARE2
 #define	__BUS_DEBUG_ACCESS(h, o, desc, sz) do {				\
 	CTR4(KTR_BUS, "bus space: %s %d: handle %#lx, offset %#lx",	\
 	    (desc), (sz), (h), (o));					\
diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h
index 10a983b..340f382 100644
--- a/sys/sys/ktr.h
+++ b/sys/sys/ktr.h
@@ -77,19 +77,6 @@
 #define	KTR_BUF		0x40000000		/* Buffer cache */
 #define	KTR_ALL		0x7fffffff
 
-/*
- * Trace classes which can be assigned to particular use at compile time
- * These must remain in high 22 as some assembly code counts on it
- */
-#define KTR_CT1		0x01000000
-#define KTR_CT2		0x02000000
-#define KTR_CT3		0x04000000
-#define KTR_CT4		0x08000000
-#define KTR_CT5		0x10000000
-#define KTR_CT6		0x20000000
-#define KTR_CT7		0x40000000
-#define KTR_CT8		0x80000000
-
 /* Trace classes to compile in */
 #ifdef KTR
 #ifndef KTR_COMPILE