diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-05-02 22:31:13 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-05-02 22:31:13 -0400 |
| commit | 60e677bfffd835ef56d8a2f25f9a2f8eaa8f2b7c (patch) | |
| tree | f08c3de386ee6289abbb1a7180c06f6c7c67a2c7 /init | |
| parent | fbd46dc5333e0bc45719a7ed38d3411aef7dcd61 (diff) | |
| parent | 60584ef99395a89d136399bbc127289a4aa29dc7 (diff) | |
Merge commit 'v2.6.38.5' into linaro-2.6.38
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 64da1a37121..5e4a178571f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1244,6 +1244,7 @@ config SLAB per cpu and per node queues. config SLUB + depends on BROKEN || NUMA || !DISCONTIGMEM bool "SLUB (Unqueued Allocator)" help SLUB is a slab allocator that minimizes cache line usage |