summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-12-09 12:39:54 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-01-05 11:30:59 +0100
commit663b895e493c99854e5857f85ecd261149373b87 (patch)
tree512c69db538cf28c1c0fb267a8a10e6cdd12d550
parenta9d7b3d00e681ee3cfe33b00d58ef9d6bd0645df (diff)
downloadbarebox-663b895e493c99854e5857f85ecd261149373b87.tar.gz
barebox-663b895e493c99854e5857f85ecd261149373b87.tar.xz
malloc: Add a function to detect if malloc pool is already initialized
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/memory.c8
-rw-r--r--include/malloc.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/common/memory.c b/common/memory.c
index 57c73abb22..4725f6e382 100644
--- a/common/memory.c
+++ b/common/memory.c
@@ -49,6 +49,13 @@ unsigned long mem_malloc_end(void)
tlsf_pool tlsf_mem_pool;
#endif
+int mem_malloc_initialized;
+
+int mem_malloc_is_initialized(void)
+{
+ return mem_malloc_initialized;
+}
+
void mem_malloc_init(void *start, void *end)
{
malloc_start = (unsigned long)start;
@@ -57,6 +64,7 @@ void mem_malloc_init(void *start, void *end)
#ifdef CONFIG_MALLOC_TLSF
tlsf_mem_pool = tlsf_create(start, end - start + 1);
#endif
+ mem_malloc_initialized = 1;
}
#if !defined __SANDBOX__ && !defined CONFIG_ARCH_EFI
diff --git a/include/malloc.h b/include/malloc.h
index a36f3c0de4..0d3c9e97a0 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -11,4 +11,6 @@ void *calloc(size_t, size_t);
void malloc_stats(void);
void *sbrk(ptrdiff_t increment);
+int mem_malloc_is_initialized(void);
+
#endif /* __MALLOC_H */