Merge branch 'master' into next

[u-boot] / common / dlmalloc.c

diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index ca088a17d1596fc192be4cd3dc12b9b2ab2a411c..735b3443e63a556e0af9dbd63f3def0286f85a0a 100644 (file)
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1522,11 +1522,6 @@ void *sbrk(ptrdiff_t increment)
        return (void *)old;
 }
 
-#ifndef CONFIG_X86
-/*
- * x86 boards use a slightly different init sequence thus they implement
- * their own version of mem_malloc_init()
- */
 void mem_malloc_init(ulong start, ulong size)
 {
        mem_malloc_start = start;
@@ -1535,7 +1530,6 @@ void mem_malloc_init(ulong start, ulong size)
 
        memset((void *)mem_malloc_start, 0, size);
 }
-#endif
 
 /* field-extraction macros */