mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-03-16 23:07:00 +00:00
dlmalloc: Add support for SPL_SYS_MALLOC_CLEAR_ON_INIT
To support SPL_SYS_MALLOC_CLEAR_ON_INIT, we have to modify #ifdef CONFIG_SYS_MALLOC_CLEAR_ON_INIT to #if CONFIG_IS_ENABLED(SYS_MALLOC_CLEAR_ON_INIT) Signed-off-by: Bo Gan <ganboing@gmail.com> Signed-off-by: Shengyu Qu <wiagn233@outlook.com> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
dd1eb1af26
commit
c9db9a2ef5
1 changed files with 3 additions and 3 deletions
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue