diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-06-30 15:03:03 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-06-30 15:03:03 +0000 |
commit | 66a9239a2ceb205d51d307ee9e50c37221f2362c (patch) | |
tree | 0566402e211a00efb9423f701301a3b21bec61a7 /cpukit/score/src/coremutexsurrender.c | |
parent | 2008-06-30 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-66a9239a2ceb205d51d307ee9e50c37221f2362c.tar.bz2 |
Rename __STRICT_ORDER_MUTEX__ to __RTEMS_STRICT_ORDER_MUTEX__.
Diffstat (limited to 'cpukit/score/src/coremutexsurrender.c')
-rw-r--r-- | cpukit/score/src/coremutexsurrender.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpukit/score/src/coremutexsurrender.c b/cpukit/score/src/coremutexsurrender.c index 29b246983f..47ca7de8db 100644 --- a/cpukit/score/src/coremutexsurrender.c +++ b/cpukit/score/src/coremutexsurrender.c @@ -54,7 +54,7 @@ CORE_mutex_Status _CORE_mutex_Surrender( { Thread_Control *the_thread; Thread_Control *holder; -#ifdef __STRICT_ORDER_MUTEX__ +#ifdef __RTEMS_STRICT_ORDER_MUTEX__ Chain_Node *first_node; #endif holder = the_mutex->holder; @@ -98,7 +98,7 @@ CORE_mutex_Status _CORE_mutex_Surrender( */ if ( _CORE_mutex_Is_inherit_priority( &the_mutex->Attributes ) || _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ){ -#ifdef __STRICT_ORDER_MUTEX__ +#ifdef __RTEMS_STRICT_ORDER_MUTEX__ /*Check whether the holder release the mutex in LIFO order if not return error code*/ if(holder->lock_mutex.first != &the_mutex->queue.lock_queue){ @@ -119,7 +119,7 @@ CORE_mutex_Status _CORE_mutex_Surrender( */ if ( _CORE_mutex_Is_inherit_priority( &the_mutex->Attributes ) || _CORE_mutex_Is_priority_ceiling( &the_mutex->Attributes ) ) { -#ifdef __STRICT_ORDER_MUTEX__ +#ifdef __RTEMS_STRICT_ORDER_MUTEX__ if(the_mutex->queue.priority_before != holder->current_priority) _Thread_Change_priority(holder,the_mutex->queue.priority_before,TRUE); #endif @@ -157,14 +157,14 @@ CORE_mutex_Status _CORE_mutex_Surrender( case CORE_MUTEX_DISCIPLINES_PRIORITY: break; case CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT: -#ifdef __STRICT_ORDER_MUTEX__ +#ifdef __RTEMS_STRICT_ORDER_MUTEX__ _Chain_Prepend_unprotected(&the_thread->lock_mutex,&the_mutex->queue.lock_queue); the_mutex->queue.priority_before = the_thread->current_priority; #endif the_thread->resource_count++; break; case CORE_MUTEX_DISCIPLINES_PRIORITY_CEILING: -#ifdef __STRICT_ORDER_MUTEX__ +#ifdef __RTEMS_STRICT_ORDER_MUTEX__ _Chain_Prepend_unprotected(&the_thread->lock_mutex,&the_mutex->queue.lock_queue); the_mutex->queue.priority_before = the_thread->current_priority; #endif |