svn commit: r210334 - in head/sys: dev/cas dev/gem dev/hme sparc64/include sparc64/sparc64 sun4v/include sys

[Attilio Rao]

Author: attilio
Date: Wed Jul 21 10:05:07 2010
New Revision: 210334
URL: http://svn.freebsd.org/changeset/base/210334

Log:
  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

Modified:
  head/sys/dev/cas/if_cas.c
  head/sys/dev/gem/if_gem.c
  head/sys/dev/hme/if_hme.c
  head/sys/sparc64/include/bus.h
  head/sys/sparc64/sparc64/pmap.c
  head/sys/sparc64/sparc64/tsb.c
  head/sys/sun4v/include/bus.h
  head/sys/sys/ktr.h

Modified: head/sys/dev/cas/if_cas.c
==============================================================================
--- head/sys/dev/cas/if_cas.c	Wed Jul 21 10:02:59 2010	(r210333)
+++ head/sys/dev/cas/if_cas.c	Wed Jul 21 10:05:07 2010	(r210334)
@@ -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

Modified: head/sys/dev/gem/if_gem.c
==============================================================================
--- head/sys/dev/gem/if_gem.c	Wed Jul 21 10:02:59 2010	(r210333)
+++ head/sys/dev/gem/if_gem.c	Wed Jul 21 10:05:07 2010	(r210334)
@@ -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)				\

Modified: head/sys/dev/hme/if_hme.c
==============================================================================
--- head/sys/dev/hme/if_hme.c	Wed Jul 21 10:02:59 2010	(r210333)
+++ head/sys/dev/hme/if_hme.c	Wed Jul 21 10:05:07 2010	(r210334)
@@ -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>

Modified: head/sys/sparc64/include/bus.h
==============================================================================
--- head/sys/sparc64/include/bus.h	Wed Jul 21 10:02:59 2010	(r210333)
+++ head/sys/sparc64/include/bus.h	Wed Jul 21 10:05:07 2010	(r210334)
@@ -194,7 +194,7 @@ bus_space_subregion(bus_space_tag_t t, b
 #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));					\

Modified: head/sys/sparc64/sparc64/pmap.c
==============================================================================
--- head/sys/sparc64/sparc64/pmap.c	Wed Jul 21 10:02:59 2010	(r210333)
+++ head/sys/sparc64/sparc64/pmap.c	Wed Jul 21 10:05:07 2010	(r210334)
@@ -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,

Modified: head/sys/sparc64/sparc64/tsb.c
==============================================================================
--- head/sys/sparc64/sparc64/tsb.c	Wed Jul 21 10:02:59 2010	(r210333)
+++ head/sys/sparc64/sparc64/tsb.c	Wed Jul 21 10:05:07 2010	(r210334)
@@ -118,7 +118,7 @@ tsb_tte_enter(pmap_t pm, vm_page_t m, vm
 	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,

Modified: head/sys/sun4v/include/bus.h
==============================================================================
--- head/sys/sun4v/include/bus.h	Wed Jul 21 10:02:59 2010	(r210333)
+++ head/sys/sun4v/include/bus.h	Wed Jul 21 10:05:07 2010	(r210334)
@@ -194,7 +194,7 @@ bus_space_subregion(bus_space_tag_t t, b
 #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));					\

Modified: head/sys/sys/ktr.h
==============================================================================
--- head/sys/sys/ktr.h	Wed Jul 21 10:02:59 2010	(r210333)
+++ head/sys/sys/ktr.h	Wed Jul 21 10:05:07 2010	(r210334)
@@ -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