2010-08-09 Joel Sherrill <joel.sherrill@oarcorp.com>

	PR 1661/testing
	* spfifo02/init.c, spmountmgr01/init.c, spprivenv01/init.c: Eliminate
	most references to RTEMS_Malloc_Heap.

1 files changed, 2 insertions, 6 deletions

diff --git a/testsuites/sptests/spmountmgr01/init.c b/testsuites/sptests/spmountmgr01/init.c
index 69b36a2f2e..890fa4a137 100644
--- a/testsuites/sptests/spmountmgr01/init.c
+++ b/testsuites/sptests/spmountmgr01/init.c
@@ -11,11 +11,9 @@
 
 #include <tmacros.h>
 #include "test_support.h"
-#include <rtems/score/heap.h>
 #include <errno.h>
 #include <rtems/libio_.h>
-
-extern Heap_Control  *RTEMS_Malloc_Heap;
+#include <rtems/libcsupport.h>
 
 int fs_mount( rtems_filesystem_mount_table_entry_t *mt_entry,
 	      const void                           *data )
@@ -29,13 +27,11 @@ rtems_task Init(
 {
   int status = 0;
   void *alloc_ptr = (void *)0;
-  Heap_Information_block Info;
  
   puts( "\n\n*** TEST MOUNT MANAGER ROUTINE - 01 ***" );
 
   puts( "Init - allocating most of heap -- OK" );
-  _Heap_Get_information(RTEMS_Malloc_Heap, &Info);
-  alloc_ptr = malloc( Info.Free.largest - 4 );
+  alloc_ptr = malloc( malloc_free_space() - 4 );
   rtems_test_assert( alloc_ptr != NULL );
 
   puts( "Init - attempt to register filesystem fs - expect ENOMEM" );