From owner-p4-projects@FreeBSD.ORG  Sat Jan 28 20:17:06 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 99CC016A425; Sat, 28 Jan 2006 20:17:05 +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 6DB8916A425
	for <perforce@freebsd.org>; Sat, 28 Jan 2006 20:17:05 +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 0176043D75
	for <perforce@freebsd.org>; Sat, 28 Jan 2006 20:17:05 +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 k0SKH4Ux057648
	for <perforce@freebsd.org>; Sat, 28 Jan 2006 20:17:04 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0SKH4op057645
	for perforce@freebsd.org; Sat, 28 Jan 2006 20:17:04 GMT
	(envelope-from alc@freebsd.org)
Date: Sat, 28 Jan 2006 20:17:04 GMT
Message-Id: <200601282017.k0SKH4op057645@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 90567 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: Sat, 28 Jan 2006 20:17:06 -0000

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

Change 90567 by alc@alc_home on 2006/01/28 20:16:52

	Modify vm_pageq_remove() and vm_pageq_remove_nowakeup() to be able
	to remove cache state pages from the buddy queues.  (This is not yet
	used.)

Affected files ...

.. //depot/projects/superpages/src/sys/vm/vm_pageq.c#11 edit

Differences ...

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

@@ -164,7 +164,11 @@
 	int queue = VM_PAGE_GETQUEUE(m);
 	struct vpgqueues *pq;
 
-	if (queue != PQ_NONE) {
+	if ((queue - m->buddyq) == PQ_BUDDY) {
+		buddy_unfree(m);
+		KASSERT(m->queue == PQ_NONE, ("xxx"));
+		vm_page_flag_clear(m, PG_CACHE);
+	} else if (queue != PQ_NONE) {
 		pq = &vm_page_queues[queue];
 		VM_PAGE_SETQUEUE2(m, PQ_NONE);
 		TAILQ_REMOVE(&pq->pl, m, pageq);
@@ -187,7 +191,13 @@
 	int queue = VM_PAGE_GETQUEUE(m);
 	struct vpgqueues *pq;
 
-	if (queue != PQ_NONE) {
+	if ((queue - m->buddyq) == PQ_BUDDY) {
+		buddy_unfree(m);
+		KASSERT(m->queue == PQ_NONE, ("xxx"));
+		vm_page_flag_clear(m, PG_CACHE);
+		if (vm_paging_needed())
+			pagedaemon_wakeup();
+	} else if (queue != PQ_NONE) {
 		VM_PAGE_SETQUEUE2(m, PQ_NONE);
 		pq = &vm_page_queues[queue];
 		TAILQ_REMOVE(&pq->pl, m, pageq);