From owner-p4-projects@FreeBSD.ORG  Thu May  5 11:50:27 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 510DA16A4D0; Thu,  5 May 2005 11:50:27 +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 1443116A4CE
	for <perforce@freebsd.org>; Thu,  5 May 2005 11:50:27 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DE47543D4C
	for <perforce@freebsd.org>; Thu,  5 May 2005 11:50:26 +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.13.1/8.13.1) with ESMTP id j45BoQgb044292
	for <perforce@freebsd.org>; Thu, 5 May 2005 11:50:26 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j45BoQHT044289
	for perforce@freebsd.org; Thu, 5 May 2005 11:50:26 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 5 May 2005 11:50:26 GMT
Message-Id: <200505051150.j45BoQHT044289@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 76552 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: Thu, 05 May 2005 11:50:28 -0000

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

Change 76552 by rwatson@rwatson_paprika on 2005/05/05 11:49:52

	Correct merge-o.

Affected files ...

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

Differences ...

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

@@ -332,7 +332,6 @@
 	 * XXX: It might be useful to move this into the shm_delete_mapping
 	 * function
 	 */
-	struct shmid_kernel *shmsegptr;
 	shmsegptr = &shmsegs[IPCID_TO_IX(shmmap_s->shmid)];
 	error = mac_check_sysv_shmdt(td->td_ucred, shmsegptr);
 	if (error != 0) {