diff options
| author | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2011-04-21 19:05:15 +0000 |
|---|---|---|
| committer | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2011-04-21 19:05:15 +0000 |
| commit | d7c388321ad2f250cb35f01dc4c8dda7489c3416 (patch) | |
| tree | 292c6c350e7f96ddb3cc0a910433ceb296c24db1 /cpukit/score/cpu/nios2 | |
| parent | 2011-04-21 Jennifer Averett <Jennifer.Averett@OARcorp.com (diff) | |
| download | rtems-d7c388321ad2f250cb35f01dc4c8dda7489c3416.tar.bz2 | |
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.
Diffstat (limited to 'cpukit/score/cpu/nios2')
| -rw-r--r-- | cpukit/score/cpu/nios2/irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpukit/score/cpu/nios2/irq.c b/cpukit/score/cpu/nios2/irq.c index 2d4aac820f..5687f853c4 100644 --- a/cpukit/score/cpu/nios2/irq.c +++ b/cpukit/score/cpu/nios2/irq.c @@ -50,7 +50,7 @@ void __ISR_Handler(uint32_t vector, CPU_Interrupt_frame *ifr) _ISR_Nest_level++; - _Thread_Dispatch_disable_level++; + _Thread_Dispatch_increment_disable_level(); if ( _ISR_Vector_table[ vector] ) { @@ -60,7 +60,7 @@ void __ISR_Handler(uint32_t vector, CPU_Interrupt_frame *ifr) /* Make sure that interrupts are disabled again */ _CPU_ISR_Disable( level ); - _Thread_Dispatch_disable_level--; + _Thread_Dispatch_decrement_disable_level(); _ISR_Nest_level--; @@ -69,7 +69,7 @@ void __ISR_Handler(uint32_t vector, CPU_Interrupt_frame *ifr) stack_ptr = _old_stack_ptr; #endif - if( _Thread_Dispatch_disable_level == 0 ) + if( !_Thread_Dispatch_in_critical_section() ) { if ( _Thread_Dispatch_necessary ) { _CPU_ISR_Enable( level ); |