From: Yasunori Goto <y-goto@jp.fujitsu.com>
Date: Fri, 22 Dec 2006 09:09:44 +0000 (-0800)
Subject: [PATCH] handle SLOB with sparsemen
X-Git-Tag: v2.6.20-rc2~34
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=561ccd3a97867ed33e1670feeca3391cd4d6fa2c;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/init/Kconfig b/init/Kconfig
index 9b1adb176ea..a3f83e2c825 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.