summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2013-02-06 17:22:16 +0000
committerattilio <attilio@FreeBSD.org>2013-02-06 17:22:16 +0000
commitcde4f0caa2bc9884e5b685118a494ad21a059338 (patch)
tree2f1f50d7edcf39472d0616a43e31db7e0ddaa017
parent22b0de04b37e2f9cc518deb22297bf6bdb1c028d (diff)
downloadFreeBSD-src-cde4f0caa2bc9884e5b685118a494ad21a059338.zip
FreeBSD-src-cde4f0caa2bc9884e5b685118a494ad21a059338.tar.gz
Fix mismerge.
-rw-r--r--sys/vm/vm_object.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index f997d08..d42a364 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -1884,14 +1884,6 @@ again:
if ((options & OBJPR_NOTMAPPED) == 0) {
pmap_remove_all(p);
/* Account for removal of wired mappings. */
- if (wirings != 0) {
- KASSERT(p->wire_count == wirings,
- ("inconsistent wire count %d %d %p",
- p->wire_count, wirings, p));
- p->wire_count = 0;
- atomic_subtract_int(&cnt.v_wire_count,
- 1);
- }
if (wirings != 0)
p->wire_count -= wirings;
}
OpenPOWER on IntegriCloud