Merge branch 'next'

Merge the outstanding changes from the 'next' branch to master.

1 files changed, 3 insertions, 3 deletions

diff --git a/include/malloc.h b/include/malloc.h
index 9e0be482416..3979fc62830 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -904,11 +904,11 @@ void *realloc_simple(void *ptr, size_t size);
 # define mALLOPt		dlmallopt
 
 /* Ensure that U-Boot actually uses these too */
-#define calloc dlcalloc
+#define calloc(x,y) dlcalloc(x,y)
 #define free(ptr) dlfree(ptr)
 #define malloc(x) dlmalloc(x)
-#define memalign dlmemalign
-#define realloc dlrealloc
+#define memalign(a,x) dlmemalign(a,x)
+#define realloc(p,x) dlrealloc(p,x)
 #define valloc dlvalloc
 #define pvalloc dlpvalloc
 #define mallinfo() dlmallinfo()