summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2016-03-05 10:30:53 -0700
committerTom Rini <trini@konsulko.com>2016-03-08 15:01:47 -0500
commitdeff6fb3a7790e93264292982000275e78bb12e5 (patch)
tree2eee08d1dcc04d88cba95fd7b323842c0468320f /common
parent2f0bcd4de1ab0cb03f01428a334cd91f8870504c (diff)
downloadtalos-obmc-uboot-deff6fb3a7790e93264292982000275e78bb12e5.tar.gz
talos-obmc-uboot-deff6fb3a7790e93264292982000275e78bb12e5.zip
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 <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>
Diffstat (limited to 'common')
-rw-r--r--common/dlmalloc.c2
1 files changed, 1 insertions, 1 deletions
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
OpenPOWER on IntegriCloud