3 files changed, 12 insertions, 17 deletions
diff --git a/include/mach_debug/mach_debug.defs b/include/mach_debug/mach_debug.defs
index 2a58dc4..053c3fe 100644
--- a/include/mach_debug/mach_debug.defs
+++ b/include/mach_debug/mach_debug.defs
@@ -42,17 +42,7 @@ skip;	/* host_ipc_statistics_reset */
 skip;	/* host_callout_info */
 skip;	/* host_callout_statistics */
 skip;	/* host_callout_statistics_reset */
-
-/*
- *	Returns information about the memory allocation zones.
- */
-routine host_zone_info(
-		host		: host_t;
-	out	names		: zone_name_array_t,
-					CountInOut, Dealloc;
-	out	info		: zone_info_array_t,
-					CountInOut, Dealloc);
-
+skip;	/* host_zone_info */
 skip;	/* host_ipc_bucket_info */
 
 #if	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
@@ -228,6 +218,14 @@ routine mach_vm_object_pages(
 	out	pages		: vm_page_info_array_t,
 					CountInOut, Dealloc);
 
+/*
+ *	Returns information about the memory allocation caches.
+ */
+routine host_slab_info(
+		host		: host_t;
+	out	info		: cache_info_array_t,
+					CountInOut, Dealloc);
+
 #else	/* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
 skip;	/* mach_vm_region_info */
 skip;	/* mach_vm_object_info */
diff --git a/include/mach_debug/mach_debug_types.defs b/include/mach_debug/mach_debug_types.defs
index 9f1976f..f60125a 100644
--- a/include/mach_debug/mach_debug_types.defs
+++ b/include/mach_debug/mach_debug_types.defs
@@ -32,11 +32,8 @@
 
 #include <mach/std_types.defs>
 
-type zone_name_t = struct[80] of char;
-type zone_name_array_t = array[] of zone_name_t;
-
-type zone_info_t = struct[9] of integer_t;
-type zone_info_array_t = array[] of zone_info_t;
+type cache_info_t = struct[19] of integer_t;
+type cache_info_array_t = array[] of cache_info_t;
 
 type hash_info_bucket_t = struct[1] of natural_t;
 type hash_info_bucket_array_t = array[] of hash_info_bucket_t;
diff --git a/include/mach_debug/mach_debug_types.h b/include/mach_debug/mach_debug_types.h
index 2ba0cb1..5d4efcd 100644
--- a/include/mach_debug/mach_debug_types.h
+++ b/include/mach_debug/mach_debug_types.h
@@ -32,7 +32,7 @@
 
 #include <mach_debug/ipc_info.h>
 #include <mach_debug/vm_info.h>
-#include <mach_debug/zone_info.h>
+#include <mach_debug/slab_info.h>
 #include <mach_debug/hash_info.h>
 
 typedef	char	symtab_name_t[32];