From owner-p4-projects@FreeBSD.ORG  Thu Jan 26 19:36:51 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5FA7616A423; Thu, 26 Jan 2006 19:36:51 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2155416A420
	for <perforce@freebsd.org>; Thu, 26 Jan 2006 19:36:51 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E37F443D46
	for <perforce@freebsd.org>; Thu, 26 Jan 2006 19:36:50 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0QJaoXH000910
	for <perforce@freebsd.org>; Thu, 26 Jan 2006 19:36:50 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0QJaoNp000907
	for perforce@freebsd.org; Thu, 26 Jan 2006 19:36:50 GMT
	(envelope-from alc@freebsd.org)
Date: Thu, 26 Jan 2006 19:36:50 GMT
Message-Id: <200601261936.k0QJaoNp000907@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	alc@freebsd.org using -f
From: Alan Cox <alc@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90416 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jan 2006 19:36:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=90416

Change 90416 by alc@alc_home on 2006/01/26 19:36:25

	Replace calls to pmap_nw_modified() by assertions; pmap_nw_modified()
	no longer exists.

Affected files ...

.. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#6 edit
.. //depot/projects/superpages/src/sys/i386/i386/pmap.c#5 edit

Differences ...

==== //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#6 (text+ko) ====

@@ -1590,13 +1590,9 @@
 		for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
 		    va < eva; va += PAGE_SIZE, m++) {
 			if (oldpde & PG_M) {
-#if defined(PMAP_DIAGNOSTIC)
-				if (pmap_nw_modified((pt_entry_t) oldpde)) {
-					printf(
-	"pmap_remove_pde: modified 2mpage not writable: va: 0x%lx, pde: 0x%lx\n",
-					    va, oldpde);
-				}
-#endif
+				KASSERT((oldpde & PG_RW) != 0,
+	("pmap_remove_pde: modified 2mpage not writable: va: %#lx, pde: %#lx",
+				    va, oldpde));
 				if (pmap_track_modified(va))
 					vm_page_dirty(m);
 			}

==== //depot/projects/superpages/src/sys/i386/i386/pmap.c#5 (text+ko) ====

@@ -1605,13 +1605,9 @@
 		for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
 		    va < eva; va += PAGE_SIZE, m++) {
 			if (oldpde & PG_M) {
-#if defined(PMAP_DIAGNOSTIC)
-				if (pmap_nw_modified((pt_entry_t) oldpde)) {
-					printf(
-	"pmap_remove_pde: modified 4mpage not writable: va: 0x%x, pde: 0x%x\n",
-					    va, oldpde);
-				}
-#endif
+				KASSERT((oldpde & PG_RW) != 0,
+	("pmap_remove_pde: modified 4mpage not writable: va: %#x, pde: %#jx",
+				    va, (uintmax_t)oldpde));
 				if (pmap_track_modified(va))
 					vm_page_dirty(m);
 			}