diff options
author | Tom Rini <trini@konsulko.com> | 2019-11-08 07:27:45 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-11-08 07:27:45 -0500 |
commit | ee1c499851e0fda1a6ab98fb1f1d1f672e64a6f8 (patch) | |
tree | 732cd565e5a59da41e14bfb69c2f85889eb6d478 /common/dlmalloc.c | |
parent | 3f2d4bf462825c106ef7a06a16ec8d5c07ef8949 (diff) | |
parent | fefff636337b53ac7fc1b0e9f38eb7b188bc0e60 (diff) |
Merge branch '2019-11-07-master-imports'
- Add Phytium Durian Board
- Assorted bugfixes
- Allow for make ERR_PTR/PTR_ERR architecture specific
Diffstat (limited to 'common/dlmalloc.c')
-rw-r--r-- | common/dlmalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 6f12a18d549..dade68faf74 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -2086,7 +2086,7 @@ Void_t* cALLOc(n, elem_size) size_t n; size_t elem_size; { #if CONFIG_VAL(SYS_MALLOC_F_LEN) if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT)) { - MALLOC_ZERO(mem, sz); + memset(mem, 0, sz); return mem; } #endif |