From owner-svn-src-stable-7@FreeBSD.ORG  Thu Mar 12 22:01:42 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A21D3106566C;
	Thu, 12 Mar 2009 22:01:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9020E8FC13;
	Thu, 12 Mar 2009 22:01:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2CM1gpe041774;
	Thu, 12 Mar 2009 22:01:42 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2CM1g8A041773;
	Thu, 12 Mar 2009 22:01:42 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200903122201.n2CM1g8A041773@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 12 Mar 2009 22:01:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189750 - stable/7/sys/vm
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Mar 2009 22:01:43 -0000

Author: jhb
Date: Thu Mar 12 22:01:42 2009
New Revision: 189750
URL: http://svn.freebsd.org/changeset/base/189750

Log:
  Disable the vm_page_startup assertion for now.  It always fails on
  platforms with superpages currently because the pages used by
  vm_reserv_startup() are incorrectly included in the 'npages' count.  I
  haven't removed the assertion as I think this is a real bug, but the side
  effect is just that some memory is wasted on never-used vm_page structures.
  
  The assertion was removed from HEAD which is why the bug wasn't noticed
  there (and thus this is a direct commit to 7).

Modified:
  stable/7/sys/vm/vm_page.c

Modified: stable/7/sys/vm/vm_page.c
==============================================================================
--- stable/7/sys/vm/vm_page.c	Thu Mar 12 20:41:52 2009	(r189749)
+++ stable/7/sys/vm/vm_page.c	Thu Mar 12 22:01:42 2009	(r189750)
@@ -363,15 +363,21 @@ vm_page_startup(vm_offset_t vaddr)
 		vm_page_array[i].order = VM_NFREEORDER;
 	vm_page_array_size = page_range;
 
+#if 0
 	/*
 	 * This assertion tests the hypothesis that npages and total are
 	 * redundant.  XXX
+	 *
+	 * XXX: This always fails if VM_NRESERVLEVEL > 0 because
+	 * npages includes the memory for vm_reserv_startup() but
+	 * page_range doesn't.
 	 */
 	page_range = 0;
 	for (i = 0; phys_avail[i + 1] != 0; i += 2)
 		page_range += atop(phys_avail[i + 1] - phys_avail[i]);
 	KASSERT(page_range == npages,
 	    ("vm_page_startup: inconsistent page counts"));
+#endif
 
 	/*
 	 * Initialize the physical memory allocator.