From deff6fb3a7790e93264292982000275e78bb12e5 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Sat, 5 Mar 2016 10:30:53 -0700 Subject: [PATCH] malloc: remove !gd handling Following the previous patch, malloc() is never called before gd is set, so we can remove the special-case check for this condition. This reverts commit 854d2b9753e4 "dlmalloc: ensure gd is set for early alloc". Cc: Rabin Vincent Signed-off-by: Stephen Warren Reviewed-by: Tom Rini Reviewed-by: Simon Glass --- common/dlmalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 5ea37dfb6e..d66e80c647 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -2184,7 +2184,7 @@ Void_t* mALLOc(bytes) size_t bytes; INTERNAL_SIZE_T nb; #ifdef CONFIG_SYS_MALLOC_F_LEN - if (gd && !(gd->flags & GD_FLG_FULL_MALLOC_INIT)) + if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT)) return malloc_simple(bytes); #endif -- 2.25.1