From owner-p4-projects@FreeBSD.ORG  Wed Oct 13 09:43:24 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0940F16A4D1; Wed, 13 Oct 2004 09:43:24 +0000 (GMT)
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 D751C16A4CE
	for <perforce@freebsd.org>; Wed, 13 Oct 2004 09:43:23 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C9CE643D53
	for <perforce@freebsd.org>; Wed, 13 Oct 2004 09:43:23 +0000 (GMT)
	(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.11/8.12.11) with ESMTP id i9D9hNsQ092172
	for <perforce@freebsd.org>; Wed, 13 Oct 2004 09:43:23 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9D9hNpj092169
	for perforce@freebsd.org; Wed, 13 Oct 2004 09:43:23 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 13 Oct 2004 09:43:23 GMT
Message-Id: <200410130943.i9D9hNpj092169@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 63146 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: Wed, 13 Oct 2004 09:43:24 -0000

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

Change 63146 by rwatson@rwatson_tislabs on 2004/10/13 09:42:37

	Correct a mis-merge: in the TrustedBSD MAC tree, the kernel uses
	a wrapper structure for System V SHM segment descriptions to avoid
	breaking the ABI.  I neglected to adapt a FreeBSD-derived change
	to use the wrapper.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#24 edit

Differences ...

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

@@ -405,7 +405,7 @@
 	rv = vm_map_find(&p->p_vmspace->vm_map, shmseg->u.shm_internal,
 		0, &attach_va, size, (flags & MAP_FIXED)?0:1, prot, prot, 0);
 	if (rv != KERN_SUCCESS) {
-		vm_object_deallocate(shmseg->shm_internal);
+		vm_object_deallocate(shmseg->u.shm_internal);
 		error = ENOMEM;
 		goto done2;
 	}