From owner-p4-projects@FreeBSD.ORG  Thu Aug 30 09:42:00 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4200E16A418; Thu, 30 Aug 2007 09:42:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F34D816A420
	for <perforce@freebsd.org>; Thu, 30 Aug 2007 09:41:59 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E55CE13C428
	for <perforce@freebsd.org>; Thu, 30 Aug 2007 09:41:59 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7U9fxsw011953
	for <perforce@freebsd.org>; Thu, 30 Aug 2007 09:41:59 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7U9fxuX011950
	for perforce@freebsd.org; Thu, 30 Aug 2007 09:41:59 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 30 Aug 2007 09:41:59 GMT
Message-Id: <200708300941.l7U9fxuX011950@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 125846 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2007 09:42:00 -0000

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

Change 125846 by rwatson@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