svn commit: r187404 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb vm

[Alan Cox]

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