From b70458aec3cb39fd3ff16f5d626ef1226099e13d Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 24 Feb 2005 06:13:01 +0000 Subject: [PATCH] Revert the first part of revision 1.114 and modify the second part. On architectures implementing uma_small_alloc() pages do not necessarily belong to the kmem object. --- sys/vm/uma_core.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 5f311b8241f..ad0138a0bb6 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -754,9 +754,15 @@ finished: if ((keg->uk_flags & UMA_ZONE_MALLOC) || (keg->uk_flags & UMA_ZONE_REFCNT)) { + vm_object_t obj; + + if (flags & UMA_SLAB_KMEM) + obj = kmem_object; + else + obj = NULL; for (i = 0; i < keg->uk_ppera; i++) vsetobj((vm_offset_t)mem + (i * PAGE_SIZE), - kmem_object); + obj); } if (keg->uk_flags & UMA_ZONE_OFFPAGE) uma_zfree_internal(keg->uk_slabzone, slab, NULL, @@ -866,10 +872,17 @@ slab_zalloc(uma_zone_t zone, int wait) keg->uk_size); } if ((keg->uk_flags & UMA_ZONE_MALLOC) || - (keg->uk_flags & UMA_ZONE_REFCNT)) + (keg->uk_flags & UMA_ZONE_REFCNT)) { + vm_object_t obj; + + if (flags & UMA_SLAB_KMEM) + obj = kmem_object; + else + obj = NULL; for (i = 0; i < keg->uk_ppera; i++) vsetobj((vm_offset_t)mem + - (i * PAGE_SIZE), kmem_object); + (i * PAGE_SIZE), obj); + } if (keg->uk_flags & UMA_ZONE_OFFPAGE) uma_zfree_internal(keg->uk_slabzone, slab, NULL, SKIP_NONE);