summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2009-04-14 18:50:58 +0200
committerPekka Enberg <penberg@cs.helsinki.fi>2009-04-16 11:14:31 +0300
commitd8895be47d51305a48dec818803679b9a640cef5 (patch)
tree14b09473ec526f018874b34bd482cbf9429fc1f7 /init
parent4f7035a9c136b38654338bcca2e3c4829eba814c (diff)
mm: prompt slqb default for oldconfig
Change Kconfig names for slab allocator choices to prod SLQB into being the default. Hopefully increasing testing base. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig23
1 files changed, 19 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 41612a7919a5..30477312d9e4 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -967,18 +967,23 @@ config COMPAT_BRK
choice
prompt "Choose SLAB allocator"
- default SLQB
+ 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
@@ -988,11 +993,21 @@ config SLUB
and has enhanced diagnostics. SLUB is the default choice for
a slab allocator.
-config SLQB
+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)"