svn commit: r246419 - user/attilio/vmc-playground/sys/vm

[Attilio Rao]

Author: attilio
Date: Wed Feb  6 17:22:16 2013
New Revision: 246419
URL: http://svnweb.freebsd.org/changeset/base/246419

Log:
  Fix mismerge.

Modified:
  user/attilio/vmc-playground/sys/vm/vm_object.c

Modified: user/attilio/vmc-playground/sys/vm/vm_object.c
==============================================================================
--- user/attilio/vmc-playground/sys/vm/vm_object.c	Wed Feb  6 17:17:11 2013	(r246418)
+++ user/attilio/vmc-playground/sys/vm/vm_object.c	Wed Feb  6 17:22:16 2013	(r246419)
@@ -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;
 			}