diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index d11cfde955..2d2ec2068e 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-25	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* libcsupport/src/free.c, libcsupport/src/malloc.c,
+	libcsupport/src/malloc_initialize.c: Remove heap walks in case
+	RTEMS_DEBUG is defined.
+
 2010-08-25	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	PR 1672/cpukit
diff --git a/cpukit/libcsupport/src/free.c b/cpukit/libcsupport/src/free.c
index c2dea1c361..d3ee2937f9 100644
--- a/cpukit/libcsupport/src/free.c
+++ b/cpukit/libcsupport/src/free.c
@@ -28,10 +28,6 @@ void free(
   if ( !ptr )
     return;
 
-  #if defined(RTEMS_HEAP_DEBUG)
-    _Protected_heap_Walk( RTEMS_Malloc_Heap, 0, false );
-  #endif
-
   /*
    *  Do not attempt to free memory if in a critical section or ISR.
    */
diff --git a/cpukit/libcsupport/src/malloc.c b/cpukit/libcsupport/src/malloc.c
index cf0fd158b4..6bb77a4630 100644
--- a/cpukit/libcsupport/src/malloc.c
+++ b/cpukit/libcsupport/src/malloc.c
@@ -48,13 +48,6 @@ void *malloc(
        !malloc_is_system_state_OK() )
     return NULL;
 
-  /*
-   *  Walk the heap and verify its integrity
-   */
-  #if defined(RTEMS_HEAP_DEBUG)
-    _Protected_heap_Walk( RTEMS_Malloc_Heap, 0, false );
-  #endif
-
   /*
    * Try to give a segment in the current heap if there is not
    * enough space then try to grow the heap.
diff --git a/cpukit/libcsupport/src/malloc_initialize.c b/cpukit/libcsupport/src/malloc_initialize.c
index 72a2d6dbef..e00a868e5a 100644
--- a/cpukit/libcsupport/src/malloc_initialize.c
+++ b/cpukit/libcsupport/src/malloc_initialize.c
@@ -110,15 +110,5 @@ void RTEMS_Malloc_Initialize(
   }
 
   MSBUMP( space_available, _Protected_heap_Get_size(RTEMS_Malloc_Heap) );
-
-  #if defined(RTEMS_HEAP_DEBUG)
-    if ( _Protected_heap_Walk( RTEMS_Malloc_Heap, 0, false ) ) {
-      printk( "Malloc heap not initialized correctly\n" );
-      rtems_print_buffer( heap_begin, 32 );
-      printk( "\n" );
-      rtems_print_buffer( (heap_begin + heap_size) - 48, 48 );
-      rtems_fatal_error_occurred( RTEMS_NO_MEMORY );
-    }
-  #endif
 }
 #endif