diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-12 12:42:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-12 12:42:36 +1100 |
| commit | d156e387468b1a667ff33fc189a65d5fc1aba855 (patch) | |
| tree | 6bd7e9377a321a7ee246dda777a1450442e8bfc3 /init | |
| parent | 6142d00b3d3c9ee7c9ebe249680cbf6cd480a510 (diff) | |
| parent | 67b14996ec281cb80427084456da96c424f6eacf (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 09c5c6431f42..2e6e59f3e1b8 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 |