diff options
Diffstat (limited to 'cpukit/score')
-rw-r--r-- | cpukit/score/Makefile.am | 2 | ||||
-rw-r--r-- | cpukit/score/inline/rtems/score/coremutex.inl | 3 | ||||
-rw-r--r-- | cpukit/score/src/coremutex.c | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 0152e138b3..9e412863f7 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -113,7 +113,7 @@ libscore_a_SOURCES += src/heap.c src/heapallocate.c src/heapextend.c \ libscore_a_SOURCES += src/object.c src/objectallocate.c \ src/objectclearname.c src/objectcomparenameraw.c \ src/objectcomparenamestring.c src/objectcopynameraw.c \ - src/objectcopynamestring.c \ src/objectextendinformation.c \ + src/objectcopynamestring.c src/objectextendinformation.c \ src/objectfree.c src/objectget.c src/objectgetisr.c src/objectgetnext.c \ src/objectinitializeinformation.c src/objectnametoid.c \ src/objectshrinkinformation.c src/objectgetnoprotection.c \ diff --git a/cpukit/score/inline/rtems/score/coremutex.inl b/cpukit/score/inline/rtems/score/coremutex.inl index 9311cd11a5..8d417568e9 100644 --- a/cpukit/score/inline/rtems/score/coremutex.inl +++ b/cpukit/score/inline/rtems/score/coremutex.inl @@ -141,7 +141,8 @@ RTEMS_INLINE_ROUTINE int _CORE_mutex_Seize_interrupt_trylock_body( _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ){ #ifdef __STRICT_ORDER_MUTEX__ - _Chain_Prepend_unprotected(&executing->lock_mutex,&the_mutex->queue.lock_queue); + _Chain_Prepend_unprotected( &executing->lock_mutex, + &the_mutex->queue.lock_queue ); the_mutex->queue.priority_before = executing->current_priority; #endif diff --git a/cpukit/score/src/coremutex.c b/cpukit/score/src/coremutex.c index 173418ffc0..f6e6c80177 100644 --- a/cpukit/score/src/coremutex.c +++ b/cpukit/score/src/coremutex.c @@ -64,6 +64,13 @@ void _CORE_mutex_Initialize( the_mutex->holder_id = _Thread_Executing->Object.id; if ( _CORE_mutex_Is_inherit_priority( &the_mutex->Attributes ) || _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ) + +#ifdef __STRICT_ORDER_MUTEX__ + _Chain_Prepend_unprotected( &executing->lock_mutex, + &the_mutex->queue.lock_queue ); + the_mutex->queue.priority_before = executing->current_priority; +#endif + _Thread_Executing->resource_count++; } else { the_mutex->nest_count = 0; |