diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-02-14 17:50:23 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-02-14 17:50:23 +0000 |
| commit | 7ce892d633435c7f4cbe18e1100162236182f7c7 (patch) | |
| tree | c016bdf0c8f24f8dd95d068839516051c10e0f96 /cpukit/score/inline | |
| parent | 2011-02-11 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
| download | rtems-7ce892d633435c7f4cbe18e1100162236182f7c7.tar.bz2 | |
2011-02-14 Joel Sherrill <joel.sherrilL@OARcorp.com>
* score/include/rtems/score/coremutex.h,
score/inline/rtems/score/coremutex.inl, score/src/apimutexallocate.c:
Fix direction of conditional and eliminate use of nesting is error
when POSIX is disabled.
Diffstat (limited to 'cpukit/score/inline')
| -rw-r--r-- | cpukit/score/inline/rtems/score/coremutex.inl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpukit/score/inline/rtems/score/coremutex.inl b/cpukit/score/inline/rtems/score/coremutex.inl index 9f6d749b81..f6f666159b 100644 --- a/cpukit/score/inline/rtems/score/coremutex.inl +++ b/cpukit/score/inline/rtems/score/coremutex.inl @@ -205,10 +205,12 @@ RTEMS_INLINE_ROUTINE int _CORE_mutex_Seize_interrupt_trylock_body( the_mutex->nest_count++; _ISR_Enable( *level_p ); return 0; - case CORE_MUTEX_NESTING_IS_ERROR: - executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED; - _ISR_Enable( *level_p ); - return 0; + #if defined(RTEMS_POSIX_API) + case CORE_MUTEX_NESTING_IS_ERROR: + executing->Wait.return_code = CORE_MUTEX_STATUS_NESTING_NOT_ALLOWED; + _ISR_Enable( *level_p ); + return 0; + #endif case CORE_MUTEX_NESTING_BLOCKS: break; } |