From owner-p4-projects@FreeBSD.ORG  Tue Sep 16 17:41:02 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 74DB5D1C; Tue, 16 Sep 2014 17:41:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3663DD1A
 for <perforce@freebsd.org>; Tue, 16 Sep 2014 17:41:02 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 21CD111C
 for <perforce@freebsd.org>; Tue, 16 Sep 2014 17:41:02 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8GHf1GX059571
 for <perforce@freebsd.org>; Tue, 16 Sep 2014 17:41:01 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8GHf1dO059568
 for perforce@freebsd.org; Tue, 16 Sep 2014 17:41:01 GMT
 (envelope-from jhb@freebsd.org)
Date: Tue, 16 Sep 2014 17:41:01 GMT
Message-Id: <201409161741.s8GHf1dO059568@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1200321 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Tue, 16 Sep 2014 17:41:02 -0000

http://p4web.freebsd.org/@@1200321?ac=10

Change 1200321 by jhb@jhb_jhbbsd on 2014/09/16 17:40:10

	More hacks re: MAP_RENAME and MAP_NORESERVE.

Affected files ...

.. //depot/projects/smpng/sys/sys/param.h#196 edit
.. //depot/projects/smpng/sys/vm/vm_mmap.c#113 edit

Differences ...

==== //depot/projects/smpng/sys/sys/param.h#196 (text+ko) ====

@@ -80,6 +80,7 @@
 #define	P_OSREL_SIGWAIT		700000
 #define	P_OSREL_SIGSEGV		700004
 #define	P_OSREL_MAP_ANON	800104
+#define	P_OSREL_MAP_RENAME	1100033
 
 #define	P_OSREL_MAJOR(x)	((x) / 100000)
 #endif

==== //depot/projects/smpng/sys/vm/vm_mmap.c#113 (text+ko) ====

@@ -220,6 +220,12 @@
 	fp = NULL;
 
 	/*
+	 * Ignore old flags that used to be defined but did not do anything.
+	 */
+	if (curproc < P_OSREL_MAP_RENAME)
+		flags &= ~(MAP_RESERVED0020 | MAP_RESERVED0040);
+	
+	/*
 	 * Enforce the constraints.
 	 * Mapping of length 0 is only allowed for old binaries.
 	 * Anonymous mapping shall specify -1 as filedescriptor and