PERFORCE change 90416 for review

[Alan Cox <alc@xxxxxxxxxxx>]

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