From owner-p4-projects  Mon Oct  7 11:44:47 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2F89D37B404; Mon,  7 Oct 2002 11:44:46 -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 5B43B37B401
	for <perforce@freebsd.org>; Mon,  7 Oct 2002 11:44:43 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 03B0943E3B
	for <perforce@freebsd.org>; Mon,  7 Oct 2002 11:44:43 -0700 (PDT)
	(envelope-from green@freebsd.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g97IigCo006090
	for <perforce@freebsd.org>; Mon, 7 Oct 2002 11:44:42 -0700 (PDT)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g97Iigcx006087
	for perforce@freebsd.org; Mon, 7 Oct 2002 11:44:42 -0700 (PDT)
Date: Mon, 7 Oct 2002 11:44:42 -0700 (PDT)
Message-Id: <200210071844.g97Iigcx006087@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 18871 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://people.freebsd.org/~peter/p4db/chv.cgi?CH=18871

Change 18871 by green@green_laptop_2 on 2002/10/07 11:43:41

	Fix mismerge (?).

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#17 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#17 (text+ko) ====

@@ -430,7 +430,7 @@
 	mtx_unlock(&Giant);
 	error = 0;
 #ifdef MAC
-	if (handle != NULL && MAP_SHARED) {
+	if (handle != NULL && (flags & MAP_SHARED) != 0) {
 		error = mac_check_vnode_mmap(td->td_ucred,
 		    (struct vnode *)handle, prot);
 	}

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