diff options
| author | James Morris <jmorris@namei.org> | 2008-11-14 11:29:12 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-14 11:29:12 +1100 |
| commit | 2b828925652340277a889cbc11b2d0637f7cdaf7 (patch) | |
| tree | 32fcb3d3e466fc419fad2d3717956a5b5ad3d35a /init | |
| parent | 3a3b7ce9336952ea7b9564d976d068a238976c9d (diff) | |
| parent | 58e20d8d344b0ee083febb18c2b021d2427e56ca (diff) | |
Merge branch 'master' into next
Conflicts:
security/keys/internal.h
security/keys/process_keys.c
security/keys/request_key.c
Fixed conflicts above by using the non 'tsk' versions.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index 86b00c53fade..226da2733c1e 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 |