|
@@ -631,7 +631,7 @@ void mem_malloc_init(ulong start, ulong size)
|
|
|
|
|
|
debug("using memory %#lx-%#lx for malloc()\n", mem_malloc_start,
|
|
|
mem_malloc_end);
|
|
|
-#ifdef CONFIG_SYS_MALLOC_CLEAR_ON_INIT
|
|
|
+#if CONFIG_IS_ENABLED(SYS_MALLOC_CLEAR_ON_INIT)
|
|
|
memset((void *)mem_malloc_start, 0x0, size);
|
|
|
#endif
|
|
|
malloc_bin_reloc();
|
|
@@ -2153,7 +2153,7 @@ Void_t* cALLOc(n, elem_size) size_t n; size_t elem_size;
|
|
|
|
|
|
|
|
|
/* check if expand_top called, in which case don't need to clear */
|
|
|
-#ifdef CONFIG_SYS_MALLOC_CLEAR_ON_INIT
|
|
|
+#if CONFIG_IS_ENABLED(SYS_MALLOC_CLEAR_ON_INIT)
|
|
|
#if MORECORE_CLEARS
|
|
|
mchunkptr oldtop = top;
|
|
|
INTERNAL_SIZE_T oldtopsize = chunksize(top);
|
|
@@ -2184,7 +2184,7 @@ Void_t* cALLOc(n, elem_size) size_t n; size_t elem_size;
|
|
|
|
|
|
csz = chunksize(p);
|
|
|
|
|
|
-#ifdef CONFIG_SYS_MALLOC_CLEAR_ON_INIT
|
|
|
+#if CONFIG_IS_ENABLED(SYS_MALLOC_CLEAR_ON_INIT)
|
|
|
#if MORECORE_CLEARS
|
|
|
if (p == oldtop && csz > oldtopsize)
|
|
|
{
|