From owner-svn-src-head@FreeBSD.ORG  Fri Dec  5 15:24:43 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 71C29997;
 Fri,  5 Dec 2014 15:24:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a: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 5E057AE9;
 Fri,  5 Dec 2014 15:24:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB5FOhhW075755;
 Fri, 5 Dec 2014 15:24:43 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB5FOg2G075751;
 Fri, 5 Dec 2014 15:24:42 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201412051524.sB5FOg2G075751@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 5 Dec 2014 15:24:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275514 - in head/sys: sys vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Dec 2014 15:24:43 -0000

Author: jhb
Date: Fri Dec  5 15:24:42 2014
New Revision: 275514
URL: https://svnweb.freebsd.org/changeset/base/275514

Log:
  Always ignore the deprecated MAP_RENAME and MAP_NORESERVE flags to mmap().
  Some old libraries may be used even with newer binaries (specifically the
  Nvidia driver libraries).
  
  Differential Revision:	https://reviews.freebsd.org/D1262
  Reviewed by:	kib

Modified:
  head/sys/sys/param.h
  head/sys/vm/vm_mmap.c

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Fri Dec  5 15:02:30 2014	(r275513)
+++ head/sys/sys/param.h	Fri Dec  5 15:24:42 2014	(r275514)
@@ -81,7 +81,6 @@
 #define	P_OSREL_SIGSEGV		700004
 #define	P_OSREL_MAP_ANON	800104
 #define	P_OSREL_MAP_FSTRICT	1100036
-#define	P_OSREL_MAP_RENAME	1100039
 
 #define	P_OSREL_MAJOR(x)	((x) / 100000)
 #endif

Modified: head/sys/vm/vm_mmap.c
==============================================================================
--- head/sys/vm/vm_mmap.c	Fri Dec  5 15:02:30 2014	(r275513)
+++ head/sys/vm/vm_mmap.c	Fri Dec  5 15:24:42 2014	(r275514)
@@ -222,8 +222,7 @@ sys_mmap(td, uap)
 	/*
 	 * Ignore old flags that used to be defined but did not do anything.
 	 */
-	if (td->td_proc->p_osrel < P_OSREL_MAP_RENAME)
-		flags &= ~(MAP_RESERVED0020 | MAP_RESERVED0040);
+	flags &= ~(MAP_RESERVED0020 | MAP_RESERVED0040);
 	
 	/*
 	 * Enforce the constraints.