From owner-p4-projects  Mon Oct 28 13:13:58 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6952737B404; Mon, 28 Oct 2002 13:13:56 -0800 (PST)
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 189CD37B401
	for <perforce@freebsd.org>; Mon, 28 Oct 2002 13:13:56 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C65A943E75
	for <perforce@freebsd.org>; Mon, 28 Oct 2002 13:13:55 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9SLCnmV029603
	for <perforce@freebsd.org>; Mon, 28 Oct 2002 13:12:49 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9SLCnrc029600
	for perforce@freebsd.org; Mon, 28 Oct 2002 13:12:49 -0800 (PST)
Date: Mon, 28 Oct 2002 13:12:49 -0800 (PST)
Message-Id: <200210282112.g9SLCnrc029600@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>
Subject: PERFORCE change 20308 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 20308 by rwatson@rwatson_tislabs on 2002/10/28 13:12:28

	Prepare to merge: remove dup include (probably from integ),
	follow style(9) for #endif's.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#19 edit

Differences ...

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

@@ -50,7 +50,6 @@
 #include <sys/mac.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
-#include <sys/mac.h>
 #include <sys/kse.h>
 #include <sys/ktr.h>
 #include <sys/resourcevar.h>
@@ -183,7 +182,7 @@
 	p->p_sflag &= ~(PS_ALRMPEND | PS_NEEDSIGCHK | PS_PROFPEND | PS_XCPU);
 #ifdef MAC
 	p->p_sflag &= ~PS_MACPEND;
-#endif /* MAC */
+#endif
 	ke->ke_flags &= ~(KEF_ASTPENDING | KEF_NEEDRESCHED | KEF_OWEUPC);
 	cnt.v_soft++;
 	prticks = 0;
@@ -241,7 +240,7 @@
 #ifdef MAC
 	if (sflag & PS_MACPEND)
 		mac_thread_userret(td);
-#endif /* MAC */
+#endif
 	if (flags & KEF_NEEDRESCHED) {
 		mtx_lock_spin(&sched_lock);
 		sched_prio(td, kg->kg_user_pri);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message