From owner-p4-projects@FreeBSD.ORG  Thu Sep 29 13:51:33 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4CC1E16A421; Thu, 29 Sep 2005 13:51:33 +0000 (GMT)
X-Original-To: perforce@FreeBSD.org
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 2494B16A41F
	for <perforce@FreeBSD.org>; Thu, 29 Sep 2005 13:51:33 +0000 (GMT)
	(envelope-from deker@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8F79943D53
	for <perforce@FreeBSD.org>; Thu, 29 Sep 2005 13:51:32 +0000 (GMT)
	(envelope-from deker@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8TDpWcg026188
	for <perforce@FreeBSD.org>; Thu, 29 Sep 2005 13:51:32 GMT
	(envelope-from deker@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8TDpW5W026185
	for perforce@freebsd.org; Thu, 29 Sep 2005 13:51:32 GMT
	(envelope-from deker@FreeBSD.org)
Date: Thu, 29 Sep 2005 13:51:32 GMT
Message-Id: <200509291351.j8TDpW5W026185@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	deker@FreeBSD.org using -f
From: Rob Deker <deker@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 84484 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, 29 Sep 2005 13:51:34 -0000

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

Change 84484 by deker@deker_ibook.columbia.sparta.com on 2005/09/29 13:51:29

	Re-insert some seemingly lost Apple assertion code that modifies the implementation of io_free(). 

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.h#5 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.h#5 (text+ko) ====

@@ -146,6 +146,7 @@
 #define	io_alloc(otype)		\
 		((ipc_object_t) zalloc(ipc_object_zones[(otype)]))
 
+#if MACH_ASSERT
 /*
  *	Call the routine for io_free so that checking can be performed.
  */
@@ -153,6 +154,11 @@
 			unsigned int	otype,
 			ipc_object_t	object);
 
+#else   /* MACH_ASSERT */
+#define io_free(otype, io)  \
+        zfree(ipc_object_zones[(otype)], (vm_offset_t) (io))
+#endif /* MACH_ASSERT */
+
 /*
  * Here we depend on the ipc_object being first within the ipc_common_data,
  * which is first within the rpc_common_data, which in turn must be first