summaryrefslogtreecommitdiff
path: root/sys/vm
diff options
context:
space:
mode:
authorKip Macy <kmacy@FreeBSD.org>2008-08-19 01:16:12 +0000
committerKip Macy <kmacy@FreeBSD.org>2008-08-19 01:16:12 +0000
commit65ef1b2be00acc813e18d3f69a301a8671c80b81 (patch)
treec4096087318fd0e987886706c759d1f55aeb9ae6 /sys/vm
parent660c4615a8befbf4faa0fb4eac6f4be4e948f82f (diff)
Notes
Diffstat (limited to 'sys/vm')
-rw-r--r--sys/vm/uma.h1
-rw-r--r--sys/vm/uma_core.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/sys/vm/uma.h b/sys/vm/uma.h
index c082e9633f12..ffa8d628de84 100644
--- a/sys/vm/uma.h
+++ b/sys/vm/uma.h
@@ -488,6 +488,7 @@ void uma_zone_set_freef(uma_zone_t zone, uma_free freef);
*/
#define UMA_SLAB_BOOT 0x01 /* Slab alloced from boot pages */
#define UMA_SLAB_KMEM 0x02 /* Slab alloced from kmem_map */
+#define UMA_SLAB_KERNEL 0x04 /* Slab alloced from kernel_map */
#define UMA_SLAB_PRIV 0x08 /* Slab alloced from priv allocator */
#define UMA_SLAB_OFFP 0x10 /* Slab is managed separately */
#define UMA_SLAB_MALLOC 0x20 /* Slab is a large malloc slab */
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index c32f4d78e0ca..a74ca32c7ca1 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -751,6 +751,8 @@ finished:
if (flags & UMA_SLAB_KMEM)
obj = kmem_object;
+ else if (flags & UMA_SLAB_KERNEL)
+ obj = kernel_object;
else
obj = NULL;
for (i = 0; i < keg->uk_ppera; i++)
@@ -871,6 +873,8 @@ slab_zalloc(uma_zone_t zone, int wait)
if (flags & UMA_SLAB_KMEM)
obj = kmem_object;
+ else if (flags & UMA_SLAB_KERNEL)
+ obj = kernel_object;
else
obj = NULL;
for (i = 0; i < keg->uk_ppera; i++)