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, 15 deletions

diff --git a/vm/vm_resident.c b/vm/vm_resident.c
index 96354a4..5a63ad4 100644
--- a/vm/vm_resident.c
+++ b/vm/vm_resident.c
@@ -45,7 +45,7 @@
 #include <mach/vm_statistics.h>
 #include <machine/vm_param.h>
 #include <kern/xpr.h>
-#include <kern/zalloc.h>
+#include <kern/slab.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
@@ -58,10 +58,6 @@
 #include <vm/vm_user.h>
 #endif
 
-/* in zalloc.c XXX */
-extern vm_offset_t	zdata;
-extern vm_size_t	zdata_size;
-
 /*
  *	Associated with eacn page of user-allocatable memory is a
  *	page structure.
@@ -126,7 +122,7 @@ unsigned int	vm_page_free_count_minimum;	/* debugging */
  *	These page structures are allocated the way
  *	most other kernel structures are.
  */
-zone_t	vm_page_zone;
+struct kmem_cache	vm_page_cache;
 
 /*
  *	Fictitious pages don't have a physical address,
@@ -239,14 +235,12 @@ void vm_page_bootstrap(
 	vm_page_free_wanted = 0;
 
 	/*
-	 *	Steal memory for the zone system.
+	 *	Steal memory for the kernel map entries.
 	 */
 
 	kentry_data_size = kentry_count * sizeof(struct vm_map_entry);
 	kentry_data = pmap_steal_memory(kentry_data_size);
 
-	zdata = pmap_steal_memory(zdata_size);
-
 	/*
 	 *	Allocate (and initialize) the virtual-to-physical
 	 *	table hash buckets.
@@ -430,10 +424,8 @@ void pmap_startup(
  */
 void		vm_page_module_init(void)
 {
-	vm_page_zone = zinit((vm_size_t) sizeof(struct vm_page), 0,
-			     VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS,
-			     PAGE_SIZE,
-			     0, "vm pages");
+	kmem_cache_init(&vm_page_cache, "vm_page", sizeof(struct vm_page), 0,
+			NULL, NULL, NULL, 0);
 }
 
 /*
@@ -455,7 +447,7 @@ void vm_page_create(
 	for (paddr = round_page(start);
 	     paddr < trunc_page(end);
 	     paddr += PAGE_SIZE) {
-		m = (vm_page_t) zalloc(vm_page_zone);
+		m = (vm_page_t) kmem_cache_alloc(&vm_page_cache);
 		if (m == VM_PAGE_NULL)
 			panic("vm_page_create");
 
@@ -810,7 +802,7 @@ void vm_page_more_fictitious(void)
 	int i;
 
 	for (i = 0; i < vm_page_fictitious_quantum; i++) {
-		m = (vm_page_t) zalloc(vm_page_zone);
+		m = (vm_page_t) kmem_cache_alloc(&vm_page_cache);
 		if (m == VM_PAGE_NULL)
 			panic("vm_page_more_fictitious");