svn commit: r203820 - releng/7.3/sys/vm
Konstantin Belousov
kib at FreeBSD.org
Sat Feb 13 11:24:11 UTC 2010
Author: kib
Date: Sat Feb 13 11:24:11 2010
New Revision: 203820
URL: http://svn.freebsd.org/changeset/base/203820
Log:
MFC r195635:
Properly set MAP_ENTRY_WIRE_SKIPPED when aborting the loop.
PR: kern/143717 (for RELENG_7)
Approved by: re (bz)
Modified:
releng/7.3/sys/vm/vm_map.c
Directory Properties:
releng/7.3/sys/ (props changed)
releng/7.3/sys/cddl/contrib/opensolaris/ (props changed)
releng/7.3/sys/contrib/dev/acpica/ (props changed)
releng/7.3/sys/contrib/pf/ (props changed)
Modified: releng/7.3/sys/vm/vm_map.c
==============================================================================
--- releng/7.3/sys/vm/vm_map.c Sat Feb 13 10:42:29 2010 (r203819)
+++ releng/7.3/sys/vm/vm_map.c Sat Feb 13 11:24:11 2010 (r203820)
@@ -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++;
More information about the svn-src-all
mailing list