summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-27 15:20:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-27 15:20:33 -0700
commite8dad69408a9812d6bb42d03e74d2c314534a4fa (patch)
treedf2e09936ce189d587f4e6cfd2a70abd7238c3f7 /init
parentbe6b694713740cea4610754171deec2db9cd668b (diff)
parent4a5fa3590f09999f6db41bc386bce40848fa9f63 (diff)
downloadlinux-e8dad69408a9812d6bb42d03e74d2c314534a4fa.tar.gz
linux-e8dad69408a9812d6bb42d03e74d2c314534a4fa.tar.bz2
linux-e8dad69408a9812d6bb42d03e74d2c314534a4fa.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: [PARISC] slub: fix panic with DISCONTIGMEM [PARISC] set memory ranges in N_NORMAL_MEMORY when onlined
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 7a71e0a9992a..d886b1e9278e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1226,6 +1226,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