From owner-p4-projects@FreeBSD.ORG  Wed Nov  8 19:18:27 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 051C816A674; Wed,  8 Nov 2006 19:18:27 +0000 (UTC)
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 BD12516A665
	for <perforce@freebsd.org>; Wed,  8 Nov 2006 19:18:26 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C8D0D43EB2
	for <perforce@freebsd.org>; Wed,  8 Nov 2006 19:16:27 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8JGJrr048899
	for <perforce@freebsd.org>; Wed, 8 Nov 2006 19:16:19 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8JGJuq048896
	for perforce@freebsd.org; Wed, 8 Nov 2006 19:16:19 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 8 Nov 2006 19:16:19 GMT
Message-Id: <200611081916.kA8JGJuq048896@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109544 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: Wed, 08 Nov 2006 19:18:27 -0000

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

Change 109544 by jhb@jhb_mutex on 2006/11/08 19:15:50

	IFC @109542.

Affected files ...

.. //depot/projects/smpng/sys/vm/vm_page.c#86 integrate

Differences ...

==== //depot/projects/smpng/sys/vm/vm_page.c#86 (text+ko) ====

@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.331 2006/11/08 18:43:47 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.332 2006/11/08 19:11:54 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -320,6 +320,12 @@
 	phys_avail[biggestone + 1] = new_end;
 
 	/*
+	 * Clear all of the page structures
+	 */
+	bzero((caddr_t) vm_page_array, page_range * sizeof(struct vm_page));
+	vm_page_array_size = page_range;
+
+	/*
 	 * This assertion tests the hypothesis that npages and total are
 	 * redundant.  XXX
 	 */
@@ -330,12 +336,6 @@
 	    ("vm_page_startup: inconsistent page counts"));
 
 	/*
-	 * Clear all of the page structures
-	 */
-	bzero((caddr_t) vm_page_array, page_range * sizeof(struct vm_page));
-	vm_page_array_size = page_range;
-
-	/*
 	 * Construct the free queue(s) in descending order (by physical
 	 * address) so that the first 16MB of physical memory is allocated
 	 * last rather than first.  On large-memory machines, this avoids