diff options
| author | Tom Rini <[email protected]> | 2021-03-28 20:29:39 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-03-28 20:29:39 -0400 |
| commit | 4906238191b90be7aec2269ba8cd6aeb161cd312 (patch) | |
| tree | 1bab411fe047542ab69342a90fba6110f4dbe124 /include/malloc.h | |
| parent | 9c7335e4e68355a96bd5a411b2a5f85866823c58 (diff) | |
| parent | e5021221db3faf7e90a295d6eb045fbf5c6a908b (diff) | |
Merge tag 'dm-pull-28mar21' of git://git.denx.de/u-boot-dm into next
binman support for expanding entries, connections
misc fixes and improvements to sandbox, etc.
x86 CBFS improvements
x86 coreboot improvements
Diffstat (limited to 'include/malloc.h')
| -rw-r--r-- | include/malloc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/malloc.h b/include/malloc.h index e15e528a2e3..024b18be00e 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -880,6 +880,8 @@ extern Void_t* sbrk(); #else +void malloc_simple_info(void); + #if CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE) #define malloc malloc_simple #define realloc realloc_simple @@ -887,7 +889,6 @@ extern Void_t* sbrk(); static inline void free(void *ptr) {} void *calloc(size_t nmemb, size_t size); void *realloc_simple(void *ptr, size_t size); -void malloc_simple_info(void); #else # ifdef USE_DL_PREFIX |