summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorYasunori Goto <y-goto@jp.fujitsu.com>2006-12-22 12:09:44 +0300
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-22 19:55:49 +0300
commit561ccd3a97867ed33e1670feeca3391cd4d6fa2c (patch)
treeae004d4a913c8c3790edcce8065fb9d9d26a875d /init
parent7de6b8057976584e5a422574cae4dd21c677b4d4 (diff)
downloadlinux-561ccd3a97867ed33e1670feeca3391cd4d6fa2c.tar.xz
[PATCH] handle SLOB with sparsemen
This is to disallow to make SLOB with SMP or SPARSEMEM. This avoids latent troubles of SLOB with SLAB_DESTROY_BY_RCU. And fix compile error. Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 9b1adb176ea8..a3f83e2c8250 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -450,7 +450,7 @@ config SHMEM
config SLAB
default y
- bool "Use full SLAB allocator" if EMBEDDED
+ bool "Use full SLAB allocator" if (EMBEDDED && !SMP && !SPARSEMEM)
help
Disabling this replaces the advanced SLAB allocator and
kmalloc support with the drastically simpler SLOB allocator.