]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
malloc: remove !gd handling
authorStephen Warren <swarren@wwwdotorg.org>
Sat, 5 Mar 2016 17:30:53 +0000 (10:30 -0700)
committerTom Rini <trini@konsulko.com>
Tue, 8 Mar 2016 20:01:47 +0000 (15:01 -0500)
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 <rabin@rab.in>
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
common/dlmalloc.c

index 5ea37dfb6e4c334db262b6726bfff0e1d5362508..d66e80c647ce6b26b8a3a83a65808b0652d5600a 100644 (file)
@@ -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