PERFORCE change 125846 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=125846

Change 125846 by rwatson at rwatson_zoo on 2007/08/30 09:41:36

	Re-merge ktr.h to bring in more complete set of definitions and
	remove a conflict on KTR_MAC.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/sys/ktr.h#18 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/sys/ktr.h#18 (text+ko) ====

@@ -45,8 +45,8 @@
  * have tracing enabled and map it to 0 when they don't.
  */
 #define	KTR_GEN		0x00000001		/* General (TR) */
-#define	KTR_MAC		0x00000002		/* Mandatory Access Control */
-#define	KTR_UNUSED0	0x00000004
+#define	KTR_NET		0x00000002		/* Network */
+#define	KTR_MAC		0x00000004		/* Mandatory Access Control */
 #define	KTR_LOCK	0x00000008		/* MP locking */
 #define	KTR_SMP		0x00000010		/* MP general */
 #define	KTR_SUBSYS	0x00000020		/* Subsystem. */
@@ -75,9 +75,9 @@
 #define	KTR_SPARE5	0x10000000		/* Unused */
 #define	KTR_SCHED	0x20000000		/* Machine parsed sched info. */
 #define	KTR_BUF		0x40000000		/* Buffer cache */
-#define	KTR_SPARE	0x80000000		/* Mandatory Access Control */
 #define	KTR_ALL		0xffffffff
 
+
 /*
  * 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