From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 10 19:03:30 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AF216106564A;
	Wed, 10 Nov 2010 19:03:30 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E4C68FC19;
	Wed, 10 Nov 2010 19:03:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAAJ3UMx034284;
	Wed, 10 Nov 2010 19:03:30 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAAJ3UX2034282;
	Wed, 10 Nov 2010 19:03:30 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201011101903.oAAJ3UX2034282@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Wed, 10 Nov 2010 19:03:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215098 - projects/ofed/head/sys/vm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Nov 2010 19:03:30 -0000

Author: jeff
Date: Wed Nov 10 19:03:30 2010
New Revision: 215098
URL: http://svn.freebsd.org/changeset/base/215098

Log:
   - The entry protection can be READ or EXECUTE for wire to succeed.
  
  Discussed with:	jhb

Modified:
  projects/ofed/head/sys/vm/vm_map.c

Modified: projects/ofed/head/sys/vm/vm_map.c
==============================================================================
--- projects/ofed/head/sys/vm/vm_map.c	Wed Nov 10 18:50:12 2010	(r215097)
+++ projects/ofed/head/sys/vm/vm_map.c	Wed Nov 10 19:03:30 2010	(r215098)
@@ -2301,7 +2301,7 @@ vm_map_wire(vm_map_t map, vm_offset_t st
 	boolean_t fictitious, need_wakeup, result, user_wire;
 	vm_prot_t prot;
 
-	prot = VM_PROT_READ | VM_PROT_EXECUTE;
+	prot = 0;
 	if (flags & VM_MAP_WIRE_WRITE)
 		prot |= VM_PROT_WRITE;
 	user_wire = (flags & VM_MAP_WIRE_USER) ? TRUE : FALSE;
@@ -2371,7 +2371,8 @@ vm_map_wire(vm_map_t map, vm_offset_t st
 		 * above.)
 		 */
 		entry->eflags |= MAP_ENTRY_IN_TRANSITION;
-		if ((entry->protection & prot) != prot) {
+		if ((entry->protection & (VM_PROT_READ | VM_PROT_EXECUTE)) == 0
+		    || (entry->protection & prot) != prot) {
 			entry->eflags |= MAP_ENTRY_WIRE_SKIPPED;
 			if ((flags & VM_MAP_WIRE_HOLESOK) == 0) {
 				end = entry->end;