diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 15:31:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 15:31:26 +1100 |
| commit | 040156de477bfbaa8c4e596242a006351667c403 (patch) | |
| tree | 7221461b45ef86f72b941a3d0d56e145b3c52c6b /init | |
| parent | b945854e838d7689a306a826e6116d7a5a387efa (diff) | |
| parent | 70c1198da4e8043f6ed72a74be0aaf04aff0e76b (diff) | |
Merge remote branch 'slab/for-next'
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index d3a5db8fb011..621b87b9f918 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1059,6 +1059,11 @@ config SLUB and has enhanced diagnostics. SLUB is the default choice for a slab allocator. +config SLQB + bool "SLQB (Queued allocator)" + help + SLQB is a proposed new slab allocator. + config SLOB depends on EMBEDDED bool "SLOB (Simple Allocator)" @@ -1107,7 +1112,7 @@ config HAVE_GENERIC_DMA_COHERENT config SLABINFO bool depends on PROC_FS - depends on SLAB || SLUB_DEBUG + depends on SLAB || SLUB_DEBUG || SLQB default y config RT_MUTEXES |