diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-05-28 20:38:12 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-05-28 20:38:12 +0000 |
commit | 7c8d65e83558f0d90526b28cba00c5c0aef7ada0 (patch) | |
tree | 2f2289a752951f481a3568cd6ccb4b6c52c5f2cc /cpukit/score/inline/rtems/score | |
parent | 2009-05-28 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-7c8d65e83558f0d90526b28cba00c5c0aef7ada0.tar.bz2 |
2009-05-28 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1415/cpukit
* rtems/src/semcreate.c, rtems/src/semtranslatereturncode.c,
score/include/rtems/score/coremutex.h,
score/inline/rtems/score/coremutex.inl, score/src/coremutex.c:
Address two paths where a task with a priority above the ceiling
could obtain a priority ceiling mutex.
Diffstat (limited to 'cpukit/score/inline/rtems/score')
-rw-r--r-- | cpukit/score/inline/rtems/score/coremutex.inl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpukit/score/inline/rtems/score/coremutex.inl b/cpukit/score/inline/rtems/score/coremutex.inl index 7680f98561..bcb86058fe 100644 --- a/cpukit/score/inline/rtems/score/coremutex.inl +++ b/cpukit/score/inline/rtems/score/coremutex.inl @@ -6,7 +6,7 @@ */ /* - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -185,6 +185,7 @@ RTEMS_INLINE_ROUTINE int _CORE_mutex_Seize_interrupt_trylock_body( } /* if ( current < ceiling ) */ { executing->Wait.return_code = CORE_MUTEX_STATUS_CEILING_VIOLATED; + the_mutex->lock = CORE_MUTEX_UNLOCKED; the_mutex->nest_count = 0; /* undo locking above */ executing->resource_count--; /* undo locking above */ _ISR_Enable( level ); |