From owner-svn-src-user@FreeBSD.ORG  Wed Jul  1 23:58:04 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 65E02106564A;
	Wed,  1 Jul 2009 23:58:04 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 54BE48FC16;
	Wed,  1 Jul 2009 23:58:04 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n61Nw4qU027678;
	Wed, 1 Jul 2009 23:58:04 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n61Nw3Vf027676;
	Wed, 1 Jul 2009 23:58:04 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200907012358.n61Nw3Vf027676@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 1 Jul 2009 23:58:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195271 - user/kmacy/releng_7_2_fcs/sys/amd64/amd64
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 01 Jul 2009 23:58:04 -0000

Author: kmacy
Date: Wed Jul  1 23:58:03 2009
New Revision: 195271
URL: http://svn.freebsd.org/changeset/base/195271

Log:
  assert that page is managed

Modified:
  user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c

Modified: user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c	Wed Jul  1 23:14:21 2009	(r195270)
+++ user/kmacy/releng_7_2_fcs/sys/amd64/amd64/pmap.c	Wed Jul  1 23:58:03 2009	(r195271)
@@ -2490,10 +2490,14 @@ pmap_remove_pte(pmap_t pmap, pt_entry_t 
 		ret = PMAP_REMOVE_LAST;
 	if (oldpte & PG_MANAGED) {
 		m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME);
+		KASSERT((m->flags & PG_UNMANAGED) == 0,
+		    ("page not managed"));
 		if (vm_page_trylock(m) == 0) {
 			PMAP_UNLOCK(pmap);
 			vm_page_lock(m);
 			PMAP_LOCK(pmap);
+			KASSERT((m->flags & PG_UNMANAGED) == 0,
+			    ("page not managed"));
 		}
 		if ((oldpte & (PG_M | PG_RW)) == (PG_M | PG_RW))
 			vm_page_dirty(m);