From 7bc54a622e0c57a1085cd2990a1deedc8bd4743d Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Tue, 13 Dec 2011 20:27:56 +0000 Subject: Import the slab allocator As it is intended to completely replace the zone allocator, remove it on the way. So long to the venerable code ! * Makefrag.am (libkernel_a_SOURCES): Add kern/slab.{c,h}, remove kern/kalloc.c and kern/zalloc.{c,h}. * configfrag.ac (SLAB_VERIFY, SLAB_USE_CPU_POOLS): Add defines. * i386/Makefrag.am (libkernel_a_SOURCES): Remove i386/i386/zalloc.h. * i386/configfrag.ac (CPU_L1_SHIFT): Remove define. * include/mach_debug/slab_info.h: New file. * kern/slab.c: Likewise. * kern/slab.h: Likewise. * i386/i386/zalloc.h: Remove file. * include/mach_debug/zone_info.h: Likewise. * kern/kalloc.c: Likewise. * kern/zalloc.c: Likewise. * kern/zalloc.h: Likewise. --- Makefrag.am | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Makefrag.am') diff --git a/Makefrag.am b/Makefrag.am index 07b64997..b3e131a8 100644 --- a/Makefrag.am +++ b/Makefrag.am @@ -151,7 +151,6 @@ libkernel_a_SOURCES += \ kern/ipc_sched.h \ kern/ipc_tt.c \ kern/ipc_tt.h \ - kern/kalloc.c \ kern/kalloc.h \ kern/kern_types.h \ kern/list.h \ @@ -180,6 +179,8 @@ libkernel_a_SOURCES += \ kern/rbtree.h \ kern/rbtree_i.h \ kern/refcount.h \ + kern/slab.c \ + kern/slab.h \ kern/sched.h \ kern/sched_prim.c \ kern/sched_prim.h \ @@ -204,8 +205,6 @@ libkernel_a_SOURCES += \ kern/timer.h \ kern/xpr.c \ kern/xpr.h \ - kern/zalloc.c \ - kern/zalloc.h \ kern/elf-load.c \ kern/boot_script.c EXTRA_DIST += \ @@ -406,7 +405,7 @@ include_mach_eXec_HEADERS = \ # mach-debug-headers:= $(addprefix mach_debug/, hash_info.h ipc_info.h \ # mach_debug.defs mach_debug_types.defs mach_debug_types.h \ -# pc_info.h vm_info.h zone_info.h) +# pc_info.h vm_info.h slab_info.h) # Other headers for the distribution. We don't install these, because the # GNU C library has correct versions for users to use. -- cgit v1.2.3