From owner-svn-src-all@FreeBSD.ORG  Sat Feb 13 10:42:29 2010
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 EC9941065670;
	Sat, 13 Feb 2010 10:42:29 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D8C428FC12;
	Sat, 13 Feb 2010 10:42:29 +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 o1DAgTu4060952;
	Sat, 13 Feb 2010 10:42:29 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1DAgTos060950;
	Sat, 13 Feb 2010 10:42:29 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201002131042.o1DAgTos060950@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 13 Feb 2010 10:42:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203819 - stable/7/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: Sat, 13 Feb 2010 10:42:30 -0000

Author: kib
Date: Sat Feb 13 10:42:29 2010
New Revision: 203819
URL: http://svn.freebsd.org/changeset/base/203819

Log:
  MFC r195635:
  Properly set MAP_ENTRY_WIRE_SKIPPED when aborting the loop.
  
  PR:	kern/143717 (for RELENG_7)
  Approved by:	re (bz)

Modified:
  stable/7/sys/vm/vm_map.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/vm/vm_map.c
==============================================================================
--- stable/7/sys/vm/vm_map.c	Sat Feb 13 10:34:50 2010	(r203818)
+++ stable/7/sys/vm/vm_map.c	Sat Feb 13 10:42:29 2010	(r203819)
@@ -2060,12 +2060,12 @@ vm_map_wire(vm_map_t map, vm_offset_t st
 		if (entry->wired_count == 0) {
 			if ((entry->protection & (VM_PROT_READ|VM_PROT_EXECUTE))
 			    == 0) {
+				entry->eflags |= MAP_ENTRY_WIRE_SKIPPED;
 				if ((flags & VM_MAP_WIRE_HOLESOK) == 0) {
 					end = entry->end;
 					rv = KERN_INVALID_ADDRESS;
 					goto done;
 				}
-				entry->eflags |= MAP_ENTRY_WIRE_SKIPPED;
 				goto next_entry;
 			}
 			entry->wired_count++;