From owner-p4-projects@FreeBSD.ORG  Sat Jun 21 10:16:07 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A5D2E37B404; Sat, 21 Jun 2003 10:16:06 -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 4233037B401
	for <perforce@freebsd.org>; Sat, 21 Jun 2003 10:16:06 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D340A43F75
	for <perforce@freebsd.org>; Sat, 21 Jun 2003 10:16:05 -0700 (PDT)
	(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 h5LHG50U004741
	for <perforce@freebsd.org>; Sat, 21 Jun 2003 10:16:05 -0700 (PDT)
	(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 h5LHG573004738
	for perforce@freebsd.org; Sat, 21 Jun 2003 10:16:05 -0700 (PDT)
Date: Sat, 21 Jun 2003 10:16:05 -0700 (PDT)
Message-Id: <200306211716.h5LHG573004738@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>
Subject: PERFORCE change 33476 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: Sat, 21 Jun 2003 17:16:07 -0000

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

Change 33476 by rwatson@rwatson_powerbook on 2003/06/21 10:15:15

	Help kern_mac.c become more Darwin-friendly; don't include what
	are currently FreeBSD-specific include files; use Mach headers
	for locks and wait queues (we might be able to drop this by
	solely using our cv wrappers).  Some of these changes will have
	to be resolved later at the structure level; we may want to change
	the FreeBSD version of the MAC Framework to pass imgact argument
	pieces directly, rather than the FreeBSD-specific structure into
	MAC modules.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_mac.c#3 (text+ko) ====

@@ -45,11 +45,12 @@
 #include <sys/param.h>
 #include <sys/condvar.h>
 #include <sys/extattr.h>
+#if 0
 #include <sys/imgact.h>
+#endif
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mutex.h>
 #include <sys/mac.h>
 #include <sys/module.h>
 #include <sys/proc.h>
@@ -82,6 +83,9 @@
 #include <netinet/in.h>
 #include <netinet/ip_var.h>
 
+#include <kern/wait_queue.h>
+#include <kern/lock.h>
+
 #ifdef MAC
 
 /*