diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-26 11:44:02 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-26 11:44:02 +0300 |
| commit | d84696b49421682e064327a74f732ce197bba6b6 (patch) | |
| tree | aff9fb2f79b73f6c15b1be8c9d05e7997e58a34b /init | |
| parent | 01dae923348a56991e6e422d5f19f6c4cbc7888a (diff) | |
| parent | d354c3057d1893e6ac121c9261d5992166632005 (diff) | |
Merge branches 'slab/urgent' and 'slqb/core' into for-next
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig index 1ce05a4cb5f6..673e1cb3674a 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1017,18 +1017,23 @@ config COMPAT_BRK choice prompt "Choose SLAB allocator" - default SLUB + default SLQB_ALLOCATOR help This option allows to select a slab allocator. -config SLAB +config SLAB_ALLOCATOR bool "SLAB" help The regular slab allocator that is established and known to work well in all environments. It organizes cache hot objects in per cpu and per node queues. -config SLUB +config SLAB + bool + default y + depends on SLAB_ALLOCATOR + +config SLUB_ALLOCATOR bool "SLUB (Unqueued Allocator)" help SLUB is a slab allocator that minimizes cache line usage @@ -1038,6 +1043,21 @@ config SLUB and has enhanced diagnostics. SLUB is the default choice for a slab allocator. +config SLUB + bool + default y + depends on SLUB_ALLOCATOR + +config SLQB_ALLOCATOR + bool "SLQB (Queued allocator)" + help + SLQB is a proposed new slab allocator. + +config SLQB + bool + default y + depends on SLQB_ALLOCATOR + config SLOB depends on EMBEDDED bool "SLOB (Simple Allocator)" @@ -1093,7 +1113,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 |