From d7c388321ad2f250cb35f01dc4c8dda7489c3416 Mon Sep 17 00:00:00 2001
From: Jennifer Averett <Jennifer.Averett@OARcorp.com>
Date: Thu, 21 Apr 2011 19:05:15 +0000
Subject: 2011-04-21	Jennifer Averett <Jennifer.Averett@OARcorp.com

	PR 1777/cpukit
	* libcsupport/src/malloc_deferred.c, libcsupport/src/realloc.c,
	score/Makefile.am, score/cpu/lm32/irq.c, score/cpu/nios2/irq.c,
	score/include/rtems/score/coremutex.h,
	score/include/rtems/score/thread.h,
	score/inline/rtems/score/thread.inl, score/src/heapfree.c,
	score/src/pheapwalk.c, score/src/smp.c, score/src/threaddispatch.c:
	Consolidated access to _Thread_Dispatch_disable_level.
	* score/src/threaddisabledispatch.c, score/src/threadenabledispatch.c:
	New files.
---
 cpukit/score/src/heapfree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cpukit/score/src/heapfree.c')

diff --git a/cpukit/score/src/heapfree.c b/cpukit/score/src/heapfree.c
index 25a1e6964d..d7ed523a3c 100644
--- a/cpukit/score/src/heapfree.c
+++ b/cpukit/score/src/heapfree.c
@@ -89,7 +89,7 @@
      * is the task stack of a thread that deletes itself.  The thread dispatch
      * disable level is a way to detect this use case.
      */
-    if ( _Thread_Dispatch_disable_level == 0 ) {
+    if ( !_Thread_Dispatch_in_critical_section() ) {
       Heap_Block *const next = block->Protection_begin.next_delayed_free_block;
       if ( next == NULL ) {
         _Heap_Protection_delay_block_free( heap, block );
-- 
cgit v1.2.3