From owner-svn-src-head@FreeBSD.ORG  Sat Jul  2 23:34:47 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84DE8106564A;
	Sat,  2 Jul 2011 23:34:47 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 755B78FC0A;
	Sat,  2 Jul 2011 23:34:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p62NYlpw060084;
	Sat, 2 Jul 2011 23:34:47 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p62NYlmc060082;
	Sat, 2 Jul 2011 23:34:47 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201107022334.p62NYlmc060082@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sat, 2 Jul 2011 23:34:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223729 - head/sys/vm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Jul 2011 23:34:47 -0000

Author: alc
Date: Sat Jul  2 23:34:47 2011
New Revision: 223729
URL: http://svn.freebsd.org/changeset/base/223729

Log:
  Initialize marker pages as held rather than fictitious/wired.  Marking the
  page as held is more useful as a safety precaution in case someone forgets
  to check for PG_MARKER.
  
  Reviewed by:	kib

Modified:
  head/sys/vm/vm_pageout.c

Modified: head/sys/vm/vm_pageout.c
==============================================================================
--- head/sys/vm/vm_pageout.c	Sat Jul  2 20:58:33 2011	(r223728)
+++ head/sys/vm/vm_pageout.c	Sat Jul  2 23:34:47 2011	(r223729)
@@ -216,15 +216,21 @@ static void vm_req_vmdaemon(int req);
 #endif
 static void vm_pageout_page_stats(void);
 
+/*
+ * Initialize a dummy page for marking the caller's place in the specified
+ * paging queue.  In principle, this function only needs to set the flag
+ * PG_MARKER.  Nonetheless, it sets the flag VPO_BUSY and initializes the hold
+ * count to one as safety precautions.
+ */ 
 static void
 vm_pageout_init_marker(vm_page_t marker, u_short queue)
 {
 
 	bzero(marker, sizeof(*marker));
-	marker->flags = PG_FICTITIOUS | PG_MARKER;
+	marker->flags = PG_MARKER;
 	marker->oflags = VPO_BUSY;
 	marker->queue = queue;
-	marker->wire_count = 1;
+	marker->hold_count = 1;
 }
 
 /*