diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-05-12 12:28:04 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-05-12 12:28:04 -0700 |
| commit | f4ff3be1263a9173d049a75c0ce8791e829f9e2f (patch) | |
| tree | 8341a968d85e5a12fc63eea1f2f799d09d961a0a /init | |
| parent | 775d71e49c65f1f6aa57776ea1da62988fc9a30a (diff) | |
| parent | 0f106b4f7fe6ad697cff5c02f0edd80bb066fabe (diff) | |
Merge branch 'upstream/linaro.38' into linaro-android.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 f8f1b3982f4..eb7143a6bad 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1259,6 +1259,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 |