diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-15 07:15:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-15 07:15:06 -0400 |
| commit | bff157b3ad4b9f6be0af6987fcd62deaf0f2b799 (patch) | |
| tree | 02ae68620a40fefd9ffc2de739a8bb362baa3f08 /init | |
| parent | 8bf5e36d0429e9b8fc2c84966577f10386bd7195 (diff) | |
| parent | 23774a2f6fee0848503bfb8004eeeb5adef94f5c (diff) | |
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
Pull SLAB update from Pekka Enberg:
"Nothing terribly exciting here apart from Christoph's kmalloc
unification patches that brings sl[aou]b implementations closer to
each other"
* 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
slab: Use correct GFP_DMA constant
slub: remove verify_mem_not_deleted()
mm/sl[aou]b: Move kmallocXXX functions to common code
mm, slab_common: add 'unlikely' to size check of kmalloc_slab()
mm/slub.c: beautify code for removing redundancy 'break' statement.
slub: Remove unnecessary page NULL check
slub: don't use cpu partial pages on UP
mm/slub: beautify code for 80 column limitation and tab alignment
mm/slub: remove 'per_cpu' which is useless variable
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 18bd9e3d3274..3ecd8a1178f1 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1602,7 +1602,7 @@ endchoice | |||
| 1602 | 1602 | ||
| 1603 | config SLUB_CPU_PARTIAL | 1603 | config SLUB_CPU_PARTIAL |
| 1604 | default y | 1604 | default y |
| 1605 | depends on SLUB | 1605 | depends on SLUB && SMP |
| 1606 | bool "SLUB per cpu partial cache" | 1606 | bool "SLUB per cpu partial cache" |
| 1607 | help | 1607 | help |
| 1608 | Per cpu partial caches accellerate objects allocation and freeing | 1608 | Per cpu partial caches accellerate objects allocation and freeing |