summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorSimon Arlott <simon@fire.lp0.eu>2008-11-05 22:18:19 +0000
committerPekka Enberg <penberg@cs.helsinki.fi>2008-11-13 20:49:01 +0200
commit02f5621042e3f7e2fb6c741cbe5ee7c1f3caf354 (patch)
tree0219e50d348bb4a2ed1df3003889d00733deab40 /init
parent4ffaf869c7780bbdfc11291e5fd4b61dde662b1c (diff)
downloadlinux-3.10-02f5621042e3f7e2fb6c741cbe5ee7c1f3caf354.tar.gz
linux-3.10-02f5621042e3f7e2fb6c741cbe5ee7c1f3caf354.tar.bz2
linux-3.10-02f5621042e3f7e2fb6c741cbe5ee7c1f3caf354.zip
Kconfig: SLUB is the default slab allocator
In 2007, a0acd820807680d2ccc4ef3448387fcdbf152c73 changed the default slab allocator to SLUB, but the SLAB help text still says SLAB is the default. This change fixes that. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 86b00c53fad..226da2733c1 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -771,8 +771,7 @@ config 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. SLAB is the default choice for
- a slab allocator.
+ per cpu and per node queues.
config SLUB
bool "SLUB (Unqueued Allocator)"
@@ -781,7 +780,8 @@ config SLUB
instead of managing queues of cached objects (SLAB approach).
Per cpu caching is realized using slabs of objects instead
of queues of objects. SLUB can use memory efficiently
- and has enhanced diagnostics.
+ and has enhanced diagnostics. SLUB is the default choice for
+ a slab allocator.
config SLOB
depends on EMBEDDED