From owner-p4-projects@FreeBSD.ORG  Tue Aug 26 13:57:40 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1779916A4C1; Tue, 26 Aug 2003 13:57:40 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C352A16A4BF
	for <perforce@freebsd.org>; Tue, 26 Aug 2003 13:57:39 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9B12343F3F
	for <perforce@freebsd.org>; Tue, 26 Aug 2003 13:57:34 -0700 (PDT)
	(envelope-from Hrishikesh_Dandekar@NAI.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7QKvY0U013481
	for <perforce@freebsd.org>; Tue, 26 Aug 2003 13:57:34 -0700 (PDT)
	(envelope-from Hrishikesh_Dandekar@NAI.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7QKvXmO013478
	for perforce@freebsd.org; Tue, 26 Aug 2003 13:57:33 -0700 (PDT)
Date: Tue, 26 Aug 2003 13:57:33 -0700 (PDT)
Message-Id: <200308262057.h7QKvXmO013478@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	Hrishikesh_Dandekar@NAI.com using -f
From: Hrishikesh Dandekar <hdandeka@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 36980 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 26 Aug 2003 20:57:40 -0000

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

Change 36980 by hdandeka@hdandeka_yash on 2003/08/26 13:56:34

	Integration fix.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#405 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#405 (text+ko) ====

@@ -217,9 +217,6 @@
 #define	MAC_DEBUG_COUNTER_INC(x)	atomic_add_int(x, 1);
 #define	MAC_DEBUG_COUNTER_DEC(x)	atomic_subtract_int(x, 1);
 
-#define	MAC_DEBUG_COUNTER_INC(x)	atomic_add_int(x, 1);
-#define	MAC_DEBUG_COUNTER_DEC(x)	atomic_subtract_int(x, 1);
-
 SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mbufs, CTLFLAG_RD,
     &nmacmbufs, 0, "number of mbufs in use");
 SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, creds, CTLFLAG_RD,