From owner-svn-src-all@FreeBSD.ORG  Sun Jan 18 19:20:10 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B6B0A1065676;
	Sun, 18 Jan 2009 19:20:10 +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 A4DA98FC1F;
	Sun, 18 Jan 2009 19:20:10 +0000 (UTC) (envelope-from alc@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 n0IJKA2W084159;
	Sun, 18 Jan 2009 19:20:10 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0IJKA6Z084158;
	Sun, 18 Jan 2009 19:20:10 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200901181920.n0IJKA6Z084158@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 18 Jan 2009 19:20:10 +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: r187404 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2009 19:20:11 -0000

Author: alc
Date: Sun Jan 18 19:20:10 2009
New Revision: 187404
URL: http://svn.freebsd.org/changeset/base/187404

Log:
  MFC rev 179921
    KERNBASE is not necessarily an address within the kernel map, e.g.,
    PowerPC/AIM.  Consequently, it should not be used to determine the maximum
    number of kernel map entries.  Instead, use VM_MIN_KERNEL_ADDRESS, which
    marks the start of the kernel map on all architectures.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/vm/vm_map.c

Modified: stable/7/sys/vm/vm_map.c
==============================================================================
--- stable/7/sys/vm/vm_map.c	Sun Jan 18 18:54:41 2009	(r187403)
+++ stable/7/sys/vm/vm_map.c	Sun Jan 18 19:20:10 2009	(r187404)
@@ -294,7 +294,7 @@ void
 vm_init2(void)
 {
 	uma_zone_set_obj(kmapentzone, &kmapentobj, lmin(cnt.v_page_count,
-	    (VM_MAX_KERNEL_ADDRESS - KERNBASE) / PAGE_SIZE) / 8 +
+	    (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) / PAGE_SIZE) / 8 +
 	     maxproc * 2 + maxfiles);
 	vmspace_zone = uma_zcreate("VMSPACE", sizeof(struct vmspace), NULL,
 #ifdef INVARIANTS