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, 7 insertions, 10 deletions

diff --git a/device/dev_lookup.c b/device/dev_lookup.c
index 2391e8d7..98a2d02c 100644
--- a/device/dev_lookup.c
+++ b/device/dev_lookup.c
@@ -32,7 +32,7 @@
 #include <mach/vm_param.h>
 
 #include <kern/queue.h>
-#include <kern/zalloc.h>
+#include <kern/slab.h>
 
 #include <device/device_types.h>
 #include <device/dev_hdr.h>
@@ -62,7 +62,7 @@ queue_head_t	dev_number_hash_table[NDEVHASH];
 decl_simple_lock_data(,
 		dev_number_lock)
 
-zone_t		dev_hdr_zone;
+struct kmem_cache	dev_hdr_cache;
 
 /*
  * Enter device in the number lookup table.
@@ -151,7 +151,7 @@ device_lookup(name)
 
 	    simple_unlock(&dev_number_lock);
 
-	    new_device = (mach_device_t) zalloc(dev_hdr_zone);
+	    new_device = (mach_device_t) kmem_cache_alloc(&dev_hdr_cache);
 	    simple_lock_init(&new_device->ref_lock);
 	    new_device->ref_count = 1;
 	    simple_lock_init(&new_device->lock);
@@ -187,7 +187,7 @@ device_lookup(name)
 	    simple_unlock(&dev_number_lock);
 
 	    if (new_device != MACH_DEVICE_NULL)
-		zfree(dev_hdr_zone, (vm_offset_t)new_device);
+		kmem_cache_free(&dev_hdr_cache, (vm_offset_t)new_device);
 	}
 
 	return (device);
@@ -233,7 +233,7 @@ mach_device_deallocate(device)
 	simple_unlock(&device->ref_lock);
 	simple_unlock(&dev_number_lock);
 
-	zfree(dev_hdr_zone, (vm_offset_t)device);
+	kmem_cache_free(&dev_hdr_cache, (vm_offset_t)device);
 }
 
 /*
@@ -376,9 +376,6 @@ dev_lookup_init()
 
 	simple_lock_init(&dev_port_lock);
 
-	dev_hdr_zone = zinit(sizeof(struct mach_device), 0,
-			     sizeof(struct mach_device) * NDEVICES,
-			     PAGE_SIZE,
-			     FALSE,
-			     "open device entry");
+	kmem_cache_init(&dev_hdr_cache, "mach_device",
+			sizeof(struct mach_device), 0, NULL, NULL, NULL, 0);
 }