summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-15 23:38:24 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 09:05:36 -0700
commit84a01c2f8ea9bf210b961c6301e8e870a46505a6 (patch)
treecf61ff3302d5bfa339f1449bc3302eded09349fd
parent5dc4ac6324094cd52dc77ddf88296a94b90bbafc (diff)
downloadlinux-84a01c2f8ea9bf210b961c6301e8e870a46505a6.tar.bz2
slob: sparsemem support
Currently slob is disabled if we're using sparsemem, due to an earlier patch from Goto-san. Slob and static sparsemem work without any trouble as it is, and the only hiccup is a missing slab_is_available() in the case of sparsemem extreme. With this, we're rid of the last set of restrictions for slob usage. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi> Acked-by: Matt Mackall <mpm@selenic.com> Cc: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--init/Kconfig2
-rw-r--r--mm/slob.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index d9d878a3bb46..63d52a089a9e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -576,7 +576,7 @@ config SLUB
and has enhanced diagnostics.
config SLOB
- depends on EMBEDDED && !SPARSEMEM
+ depends on EMBEDDED
bool "SLOB (Simple Allocator)"
help
SLOB replaces the SLAB allocator with a drastically simpler
diff --git a/mm/slob.c b/mm/slob.c
index b99b0ef2347e..b4899079d8b0 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -634,6 +634,14 @@ int kmem_ptr_validate(struct kmem_cache *a, const void *b)
return 0;
}
+static unsigned int slob_ready __read_mostly;
+
+int slab_is_available(void)
+{
+ return slob_ready;
+}
+
void __init kmem_cache_init(void)
{
+ slob_ready = 1;
}