mx28evk: Allow booting a zImage kernel

[karo-tx-uboot.git] / include / malloc.h

diff --git a/include/malloc.h b/include/malloc.h
index 47154b0783f9dc173d9c0ec8183d916c3246e5c6..ecf3c678fe4b0065c7dd622c124e956a5fe32777 100644 (file)
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -216,7 +216,8 @@
 */
 
 \f
-
+#ifndef __MALLOC_H__
+#define __MALLOC_H__
 
 /* Preliminaries */
 
@@ -284,14 +285,6 @@ extern "C" {
 
 */
 
-#ifdef DEBUG
-/* #include <assert.h> */
-#define assert(x) ((void)0)
-#else
-#define assert(x) ((void)0)
-#endif
-
-
 /*
   INTERNAL_SIZE_T is the word-size used for internal bookkeeping
   of chunk sizes. On a 64-bit machine, you can reduce malloc
@@ -936,7 +929,17 @@ int     mALLOPt();
 struct mallinfo mALLINFo();
 #endif
 
+/*
+ * Begin and End of memory area for malloc(), and current "brk"
+ */
+extern ulong mem_malloc_start;
+extern ulong mem_malloc_end;
+extern ulong mem_malloc_brk;
+
+void mem_malloc_init(ulong start, ulong size);
 
 #ifdef __cplusplus
 };  /* end of extern "C" */
 #endif
+
+#endif /* __MALLOC_H__ */