From owner-p4-projects@FreeBSD.ORG  Thu Jan 26 20:38:09 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 C7BC016A423; Thu, 26 Jan 2006 20:38:08 +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 8499116A420
	for <perforce@freebsd.org>; Thu, 26 Jan 2006 20:38:08 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 07E7C43D5A
	for <perforce@freebsd.org>; Thu, 26 Jan 2006 20:38:08 +0000 (GMT)
	(envelope-from cognet@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 k0QKc7xk004359
	for <perforce@freebsd.org>; Thu, 26 Jan 2006 20:38:07 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0QKc7JP004356
	for perforce@freebsd.org; Thu, 26 Jan 2006 20:38:07 GMT
	(envelope-from cognet@freebsd.org)
Date: Thu, 26 Jan 2006 20:38:07 GMT
Message-Id: <200601262038.k0QKc7JP004356@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90422 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 20:38:09 -0000

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

Change 90422 by cognet@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);