Adjust the kernel to use the slab allocator

* device/dev_lookup.c: Replace zalloc header, types and function calls
with their slab counterparts.
* device/dev_pager.c: Likewise.
* device/ds_routines.c: Likewise.
* device/io_req.h: Likewise.
* device/net_io.c: Likewise.
* i386/i386/fpu.c: Likewise.
* i386/i386/io_perm.c: Likewise.
* i386/i386/machine_task.c: Likewise.
* i386/i386/pcb.c: Likewise.
* i386/i386/task.h: Likewise.
* i386/intel/pmap.c: Likewise.
* i386/intel/pmap.h: Remove #include <kernel/zalloc.h>.
* include/mach_debug/mach_debug.defs (host_zone_info): Replace
routine declaration with skip directive.
(host_slab_info): New routine declaration.
* include/mach_debug/mach_debug_types.defs (zone_name_t)
(zone_name_array_t, zone_info_t, zone_info_array_t): Remove types.
(cache_info_t, cache_info_array_t): New types.
* include/mach_debug/mach_debug_types.h: Replace #include
<mach_debug/zone_info.h> with <mach_debug/slab_info.h>.
* ipc/ipc_entry.c: Replace zalloc header, types and function calls with
their slab counterparts.
* ipc/ipc_entry.h: Likewise.
* ipc/ipc_init.c: Likewise.
* ipc/ipc_marequest.c: Likewise.
* ipc/ipc_object.c: Likewise.
* ipc/ipc_object.h: Likewise.
* ipc/ipc_space.c: Likewise.
* ipc/ipc_space.h: Likewise.
* ipc/ipc_table.c (kalloc_map): Remove extern declaration.
* kern/act.c: Replace zalloc header, types and function calls with their
slab counterparts.
* kern/kalloc.h: Add #include <vm/vm_types.h>.
(MINSIZE): Remove definition.
(kalloc_map): Add extern declaration.
(kget): Remove prototype.
* kern/mach_clock.c: Adjust comment.
* kern/processor.c: Replace zalloc header, types and function calls with
their slab counterparts.
* kern/startup.c: Remove #include <kernel/zalloc.h>.
* kern/task.c: Replace zalloc header, types and function calls with
their slab counterparts.
* kern/thread.c: Likewise.
* vm/memory_object_proxy.c: Likewise.
* vm/vm_external.c: Likewise.
* vm/vm_fault.c: Likewise.
* vm/vm_init.c: Likewise.
* vm/vm_map.c: Likewise.
* vm/vm_object.c: Likewise.
* vm/vm_page.h: Remove #include <kernel/zalloc.h>.
* vm/vm_pageout.c: Replace zalloc header, types and function calls with
their slab counterparts.
* vm/vm_resident.c: Likewise.
(zdata, zdata_size): Remove declarations.
(vm_page_bootstrap): Don't steal memory for the zone system.

1 files changed, 9 insertions, 10 deletions

diff --git a/i386/i386/machine_task.c b/i386/i386/machine_task.c
index 35b89e0..689bf04 100644
--- a/i386/i386/machine_task.c
+++ b/i386/i386/machine_task.c
@@ -22,15 +22,15 @@
 
 #include <kern/lock.h>
 #include <mach/mach_types.h>
-#include <kern/zalloc.h>
+#include <kern/slab.h>
 #include <kern/mach_param.h>
 #include <machine/task.h>
 
 #include <machine/io_perm.h>
 
 
-/* The zone which holds our IO permission bitmaps.  */
-zone_t machine_task_iopb_zone;
+/* The cache which holds our IO permission bitmaps.  */
+struct kmem_cache machine_task_iopb_cache;
 
 
 /* Initialize the machine task module.  The function is called once at
@@ -38,11 +38,8 @@ zone_t machine_task_iopb_zone;
 void
 machine_task_module_init (void)
 {
-  machine_task_iopb_zone = zinit (IOPB_BYTES, 0,
-				  TASK_MAX * IOPB_BYTES,
-				  IOPB_BYTES,
-				  ZONE_COLLECTABLE | ZONE_EXHAUSTIBLE,
-				  "i386 machine task iopb");
+  kmem_cache_init (&machine_task_iopb_cache, "i386_task_iopb", IOPB_BYTES, 0,
+		   NULL, NULL, NULL, 0);
 }
 
 
@@ -62,7 +59,8 @@ void
 machine_task_terminate (task_t task)
 {
   if (task->machine.iopb)
-    zfree (machine_task_iopb_zone, (vm_offset_t) task->machine.iopb);
+    kmem_cache_free (&machine_task_iopb_cache,
+		     (vm_offset_t) task->machine.iopb);
 }
 
 
@@ -74,7 +72,8 @@ machine_task_collect (task_t task)
   simple_lock (&task->machine.iopb_lock);
   if (task->machine.iopb_size == 0 && task->machine.iopb)
     {
-      zfree (machine_task_iopb_zone, (vm_offset_t) task->machine.iopb);
+      kmem_cache_free (&machine_task_iopb_cache,
+		       (vm_offset_t) task->machine.iopb);
       task->machine.iopb = 0;
     }
   simple_unlock (&task->machine.iopb_lock);