projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://www.denx.de/git/u-boot-sunxi
[platform/kernel/u-boot.git]
/
include
/
malloc.h
diff --git
a/include/malloc.h
b/include/malloc.h
index
a38464e
..
c33f3b4
100644
(file)
--- a/
include/malloc.h
+++ b/
include/malloc.h
@@
-196,7
+196,7
@@
MORECORE_FAILURE (default: -1)
The value returned upon failure of MORECORE.
MORECORE_CLEARS (default 1)
MORECORE_FAILURE (default: -1)
The value returned upon failure of MORECORE.
MORECORE_CLEARS (default 1)
-
T
rue (1) if the routine mapped to MORECORE zeroes out memory (which
+
t
rue (1) if the routine mapped to MORECORE zeroes out memory (which
holds for sbrk).
DEFAULT_TRIM_THRESHOLD
DEFAULT_TOP_PAD
holds for sbrk).
DEFAULT_TRIM_THRESHOLD
DEFAULT_TOP_PAD
@@
-285,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
/*
INTERNAL_SIZE_T is the word-size used for internal bookkeeping
of chunk sizes. On a 64-bit machine, you can reduce malloc
@@
-495,7
+487,7
@@
do { \
***/
#undef HAVE_MREMAP /* Not available for U-Boot */
***/
#undef HAVE_MREMAP /* Not available for U-Boot */
-#if HAVE_MMAP
+#if
def
HAVE_MMAP
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
@@
-595,7
+587,7
@@
do { \
/* #define HAVE_USR_INCLUDE_MALLOC_H */
/* #define HAVE_USR_INCLUDE_MALLOC_H */
-#if HAVE_USR_INCLUDE_MALLOC_H
+#if
def
HAVE_USR_INCLUDE_MALLOC_H
#include "/usr/include/malloc.h"
#else
#include "/usr/include/malloc.h"
#else
@@
-762,7
+754,7
@@
struct mallinfo {
#ifndef DEFAULT_MMAP_MAX
#ifndef DEFAULT_MMAP_MAX
-#if HAVE_MMAP
+#if
def
HAVE_MMAP
#define DEFAULT_MMAP_MAX (64)
#else
#define DEFAULT_MMAP_MAX (0)
#define DEFAULT_MMAP_MAX (64)
#else
#define DEFAULT_MMAP_MAX (0)
@@
-937,6
+929,14
@@
int mALLOPt();
struct mallinfo mALLINFo();
#endif
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" */
#ifdef __cplusplus
}; /* end of extern "C" */