[PATCH v2 2/4] malloc: Don't use ifdefs for SYS_MALLOC_DEFAULT_TO_INIT
Sean Anderson
sean.anderson at seco.com
Wed Aug 9 00:53:18 CEST 2023
With CONFIG_IS_ENABLED we can eliminate some ifdefs.
Signed-off-by: Sean Anderson <sean.anderson at seco.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
(no changes since v1)
common/dlmalloc.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 0f9b7262d51..30c78ae976b 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -588,9 +588,7 @@ static void malloc_bin_reloc(void)
static inline void malloc_bin_reloc(void) {}
#endif
-#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT
static void malloc_init(void);
-#endif
ulong mem_malloc_start = 0;
ulong mem_malloc_end = 0;
@@ -625,9 +623,8 @@ void mem_malloc_init(ulong start, ulong size)
mem_malloc_end = start + size;
mem_malloc_brk = start;
-#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT
- malloc_init();
-#endif
+ if (CONFIG_IS_ENABLED(SYS_MALLOC_DEFAULT_TO_INIT))
+ malloc_init();
debug("using memory %#lx-%#lx for malloc()\n", mem_malloc_start,
mem_malloc_end);
@@ -733,7 +730,6 @@ static unsigned int max_n_mmaps = 0;
static unsigned long max_mmapped_mem = 0;
#endif
-#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT
static void malloc_init(void)
{
int i, j;
@@ -762,7 +758,6 @@ static void malloc_init(void)
memset((void *)¤t_mallinfo, 0, sizeof(struct mallinfo));
#endif
}
-#endif
/*
Debugging support
--
2.25.1
More information about the U-Boot
mailing list