64c64
< * $FreeBSD: head/sys/vm/vm_object.c 92511 2002-03-17 18:37:37Z alc $
---
> * $FreeBSD: head/sys/vm/vm_object.c 92654 2002-03-19 09:11:49Z jeff $
150,151d149
< static vm_zone_t obj_zone;
< static struct vm_zone obj_zone_store;
152a151
> static vm_zone_t obj_zone;
154d152
< static struct vm_object vm_objects_init[VM_OBJECTS_INIT];
155a154,189
> static void vm_object_zinit(void *mem, int size);
>
> #ifdef INVARIANTS
> static void vm_object_zdtor(void *mem, int size, void *arg);
>
> static void
> vm_object_zdtor(void *mem, int size, void *arg)
> {
> vm_object_t object;
>
> object = (vm_object_t)mem;
> KASSERT(object->paging_in_progress == 0,
> ("object %p paging_in_progress = %d",
> object, object->paging_in_progress));
> KASSERT(object->resident_page_count == 0,
> ("object %p resident_page_count = %d",
> object, object->resident_page_count));
> KASSERT(object->shadow_count == 0,
> ("object %p shadow_count = %d",
> object, object->shadow_count));
> }
> #endif
>
> static void
> vm_object_zinit(void *mem, int size)
> {
> vm_object_t object;
>
> object = (vm_object_t)mem;
>
> /* These are true for any object that has been freed */
> object->paging_in_progress = 0;
> object->resident_page_count = 0;
> object->shadow_count = 0;
> }
>
172,174d205
< object->paging_in_progress = 0;
< object->resident_page_count = 0;
< object->shadow_count = 0;
219,222c250,257
<
< obj_zone = &obj_zone_store;
< zbootinit(obj_zone, "VM OBJECT", sizeof (struct vm_object),
< vm_objects_init, VM_OBJECTS_INIT);
---
> obj_zone = uma_zcreate("VM OBJECT", sizeof (struct vm_object), NULL,
> #ifdef INVARIANTS
> vm_object_zdtor,
> #else
> NULL,
> #endif
> vm_object_zinit, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
> uma_prealloc(obj_zone, VM_OBJECTS_INIT);
228d262
< zinitna(obj_zone, NULL, NULL, 0, 0, 0, 1);