From owner-svn-src-user@FreeBSD.ORG  Wed Feb  6 17:22:17 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7D664CC5;
 Wed,  6 Feb 2013 17:22:17 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6EC6DBF3;
 Wed,  6 Feb 2013 17:22:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r16HMHVT094631;
 Wed, 6 Feb 2013 17:22:17 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r16HMHvu094630;
 Wed, 6 Feb 2013 17:22:17 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201302061722.r16HMHvu094630@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Wed, 6 Feb 2013 17:22:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r246419 - user/attilio/vmc-playground/sys/vm
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Feb 2013 17:22:17 -0000

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