aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
576 and has enhanced diagnostics. 576 and has enhanced diagnostics.
577 577
578config SLOB 578config SLOB
579 depends on EMBEDDED && !SPARSEMEM 579 depends on EMBEDDED
580 bool "SLOB (Simple Allocator)" 580 bool "SLOB (Simple Allocator)"
581 help 581 help
582 SLOB replaces the SLAB allocator with a drastically simpler 582 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)
634 return 0; 634 return 0;
635} 635}
636 636
637static unsigned int slob_ready __read_mostly;
638
639int slab_is_available(void)
640{
641 return slob_ready;
642}
643
637void __init kmem_cache_init(void) 644void __init kmem_cache_init(void)
638{ 645{
646 slob_ready = 1;
639} 647}