svn commit: r203819 - stable/7/sys/vm

[Konstantin Belousov]

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++;