PERFORCE change 90422 for review

[Olivier Houchard]

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

Change 90422 by cognet at cognet on 2006/01/26 20:37:19

	Remove use of VM_PAGE_INQUEUE2 in KASSERT() to get it to compile with
	INVARIANTS.

Affected files ...

.. //depot/projects/superpages/src/sys/vm/vm_contig.c#6 edit
.. //depot/projects/superpages/src/sys/vm/vm_pageout.c#5 edit

Differences ...

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

@@ -143,7 +143,7 @@
 		if ((m->flags & PG_MARKER) != 0)
 			continue;
 
-		KASSERT(VM_PAGE_INQUEUE2(m, queue),
+		KASSERT(m->queue == queue,
 		    ("vm_contig_launder: page %p's queue is not %d", m, queue));
 		error = vm_contig_launder_page(m);
 		if (error == 0)

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

@@ -1038,7 +1038,7 @@
 
 	while ((m != NULL) && (pcount-- > 0) && (page_shortage > 0)) {
 
-		KASSERT(VM_PAGE_INQUEUE2(m, PQ_ACTIVE),
+		KASSERT(m->queue == PQ_ACTIVE,
 		    ("vm_pageout_scan: page %p isn't active", m));
 
 		next = TAILQ_NEXT(m, pageq);
@@ -1309,7 +1309,7 @@
 	while ((m != NULL) && (pcount-- > 0)) {
 		int actcount;
 
-		KASSERT(VM_PAGE_INQUEUE2(m, PQ_ACTIVE),
+		KASSERT(m->queue == PQ_ACTIVE,
 		    ("vm_pageout_page_stats: page %p isn't active", m));
 
 		next = TAILQ_NEXT(m, pageq);