From owner-svn-src-all@FreeBSD.ORG  Tue Jun  9 17:04:39 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9070A1065677;
	Tue,  9 Jun 2009 17:04:39 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E99C8FC1A;
	Tue,  9 Jun 2009 17:04:39 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59H4dW2078076;
	Tue, 9 Jun 2009 17:04:39 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59H4dMt078075;
	Tue, 9 Jun 2009 17:04:39 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200906091704.n59H4dMt078075@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Tue, 9 Jun 2009 17:04:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193842 - head/sys/vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 17:04:40 -0000

Author: alc
Date: Tue Jun  9 17:04:39 2009
New Revision: 193842
URL: http://svn.freebsd.org/changeset/base/193842

Log:
  Eliminate an unnecessary restriction on the vm object type from
  vm_map_pmap_enter().  The immediate effect of this change is that automatic
  prefaulting by mmap() for small mappings is performed on POSIX shared memory
  objects just the same as it is on ordinary files.

Modified:
  head/sys/vm/vm_map.c

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c	Tue Jun  9 16:32:29 2009	(r193841)
+++ head/sys/vm/vm_map.c	Tue Jun  9 17:04:39 2009	(r193842)
@@ -1643,11 +1643,9 @@ vm_map_pmap_enter(vm_map_t map, vm_offse
 
 	psize = atop(size);
 
-	if (object->type != OBJT_VNODE ||
-	    ((flags & MAP_PREFAULT_PARTIAL) && (psize > MAX_INIT_PT) &&
-	     (object->resident_page_count > MAX_INIT_PT))) {
+	if ((flags & MAP_PREFAULT_PARTIAL) && psize > MAX_INIT_PT &&
+	    object->resident_page_count > MAX_INIT_PT)
 		goto unlock_return;
-	}
 
 	if (psize + pindex > object->size) {
 		if (object->size < pindex)