From bd5984deb79025a5ade18826ecdeb7eb05c3ccb4 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 17 Sep 2008 18:37:55 +0000 Subject: 2008-09-17 Joel Sherrill * 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. --- cpukit/libcsupport/src/malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpukit/libcsupport/src/malloc.c') 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) -- cgit v1.2.3