Index: sys/vm/vm_radix.c
===================================================================
--- sys/vm/vm_radix.c	(revision 246876)
+++ sys/vm/vm_radix.c	(working copy)
@@ -56,6 +56,7 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_page.h>
+#include <vm/vm_object.h>
 #include <vm/vm_radix.h>
 
 #ifdef DDB
@@ -63,7 +64,7 @@
 #endif
 
 #ifndef VM_RADIX_BOOT_CACHE
-#define	VM_RADIX_BOOT_CACHE	1500
+#define	VM_RADIX_BOOT_CACHE	6000
 #endif
 
 /*
@@ -100,6 +101,7 @@ struct vm_radix_node {
 };
 
 static uma_zone_t vm_radix_node_zone;
+static struct vm_object vm_radix_node_obj;
 
 /*
  * Boot-time cache of struct vm_radix_node objects.
@@ -373,7 +375,6 @@ vm_radix_node_zone_dtor(void *mem, int size __unus
 static void
 vm_radix_init(void *arg __unused)
 {
-	int nitems;
 
 	vm_radix_node_zone = uma_zcreate("RADIX NODE",
 	    sizeof(struct vm_radix_node), NULL,
@@ -383,10 +384,10 @@ vm_radix_init(void *arg __unused)
 	    NULL,
 #endif
 	    NULL, NULL, VM_RADIX_PAD, UMA_ZONE_VM | UMA_ZONE_NOFREE);
-	nitems = uma_zone_set_max(vm_radix_node_zone, cnt.v_page_count);
-	if (nitems < cnt.v_page_count)
-		panic("%s: unexpected requested number of items", __func__);
-	uma_prealloc(vm_radix_node_zone, nitems);
+	if (!uma_zone_set_obj(vm_radix_node_zone, &vm_radix_node_obj,
+	    cnt.v_page_count))
+		panic("%s: unable to create new zone", __func__);
+	uma_prealloc(vm_radix_node_zone, cnt.v_page_count);
 	boot_cache_cnt = VM_RADIX_BOOT_CACHE + 1;
 }
 SYSINIT(vm_radix_init, SI_SUB_KMEM, SI_ORDER_SECOND, vm_radix_init, NULL);