diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-17 18:37:55 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-17 18:37:55 +0000 |
| commit | bd5984deb79025a5ade18826ecdeb7eb05c3ccb4 (patch) | |
| tree | 36e4cefb28300a8a42e85a55c4687c63693616c6 /cpukit/libcsupport/src/malloc.c | |
| parent | 2008-09-17 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-bd5984deb79025a5ade18826ecdeb7eb05c3ccb4.tar.bz2 | |
2008-09-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/src/free.c, libcsupport/src/malloc.c,
libcsupport/src/malloc_initialize.c, libcsupport/src/malloc_p.h,
libcsupport/src/malloc_sbrk_helpers.c,
libcsupport/src/malloc_statistics_helpers.c,
libcsupport/src/malloc_walk.c, libcsupport/src/mallocfreespace.c,
libcsupport/src/mallocinfo.c, libcsupport/src/realloc.c,
libcsupport/src/rtems_memalign.c, sapi/include/confdefs.h,
score/inline/rtems/score/thread.inl: Add support for optionally
having a unified work area. In other words, the RTEMS Workspace and C
Program Heap are the same pool of memory.
Diffstat (limited to 'cpukit/libcsupport/src/malloc.c')
| -rw-r--r-- | cpukit/libcsupport/src/malloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpukit/libcsupport/src/malloc.c b/cpukit/libcsupport/src/malloc.c index fad15520bc..8338e06fb3 100644 --- a/cpukit/libcsupport/src/malloc.c +++ b/cpukit/libcsupport/src/malloc.c @@ -52,7 +52,7 @@ void *malloc( * Walk the heap and verify its integrity */ #if defined(RTEMS_HEAP_DEBUG) - _Protected_heap_Walk( &RTEMS_Malloc_Heap, 0, false ); + _Protected_heap_Walk( RTEMS_Malloc_Heap, 0, false ); #endif #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS) @@ -70,7 +70,7 @@ void *malloc( * If this fails then return a NULL pointer. */ - return_this = _Protected_heap_Allocate( &RTEMS_Malloc_Heap, size ); + return_this = _Protected_heap_Allocate( RTEMS_Malloc_Heap, size ); if ( !return_this ) { if (rtems_malloc_sbrk_helpers) |