diff options
| author | Richard Braun <rbraun@sceen.net> | 2011-12-13 20:27:56 +0000 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2011-12-17 22:12:34 +0000 |
| commit | 7bc54a622e0c57a1085cd2990a1deedc8bd4743d (patch) | |
| tree | 0356aefb0a935c30d295a86cec2386d5197c4754 /i386 | |
| parent | d25bd66fe0bd4cddb18890390198c86b9e9b56b4 (diff) | |
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.
Diffstat (limited to 'i386')
| -rw-r--r-- | i386/Makefrag.am | 1 | ||||
| -rw-r--r-- | i386/configfrag.ac | 3 | ||||
| -rw-r--r-- | i386/i386/zalloc.h | 29 |
3 files changed, 3 insertions, 30 deletions
diff --git a/i386/Makefrag.am b/i386/Makefrag.am index ab3502ac..aca4215d 100644 --- a/i386/Makefrag.am +++ b/i386/Makefrag.am @@ -136,7 +136,6 @@ libkernel_a_SOURCES += \ i386/i386/vm_param.h \ i386/i386/vm_tuning.h \ i386/i386/xpr.h \ - i386/i386/zalloc.h \ i386/intel/pmap.c \ i386/intel/pmap.h \ i386/intel/read_fault.c \ diff --git a/i386/configfrag.ac b/i386/configfrag.ac index e4ce97ef..77f66af9 100644 --- a/i386/configfrag.ac +++ b/i386/configfrag.ac @@ -25,6 +25,9 @@ dnl USE OF THIS SOFTWARE. AC_DEFINE([__ELF__], [1], [__ELF__]) AC_DEFINE([i386], [1], [i386]) + # Determines the size of the CPU cache line. + AC_DEFINE([CPU_L1_SHIFT], [6], [CPU_L1_SHIFT]) + [# Does the architecture provide machine-specific interfaces? mach_machine_routines=1;; *)] diff --git a/i386/i386/zalloc.h b/i386/i386/zalloc.h deleted file mode 100644 index bf7cf6b2..00000000 --- a/i386/i386/zalloc.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 1996-1994 The University of Utah and - * the Computer Systems Laboratory (CSL). All rights reserved. - * - * Permission to use, copy, modify and distribute this software is hereby - * granted provided that (1) source code retains these copyright, permission, - * and disclaimer notices, and (2) redistributions including binaries - * reproduce the notices in supporting documentation, and (3) all advertising - * materials mentioning features or use of this software display the following - * acknowledgement: ``This product includes software developed by the - * Computer Systems Laboratory at the University of Utah.'' - * - * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS - * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF - * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * CSL requests users of this software to return to csl-dist@cs.utah.edu any - * improvements that they make and grant CSL redistribution rights. - * - * Utah $Hdr: zalloc.h 1.4 94/12/16$ - * Author: Bryan Ford - */ - -#ifndef _I386_ZALLOC_H_ -#define _I386_ZALLOC_H_ - -#include <kern/zalloc.h> - -#endif /* _I386_ZALLOC_H_ */ |