diff options
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/src/threadqextractwithproxy.c | 23 |
2 files changed, 17 insertions, 11 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 14aae69217..cf204ccbb8 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2007-12-17 Joel Sherrill <joel.sherrill@OARcorp.com> + * score/src/threadqextractwithproxy.c: Conditionalize code that is only + required in multiprocessing configuration. + +2007-12-17 Joel Sherrill <joel.sherrill@OARcorp.com> + * score/src/objectget.c: Revert. 2007-12-17 Joel Sherrill <joel.sherrill@OARcorp.com> diff --git a/cpukit/score/src/threadqextractwithproxy.c b/cpukit/score/src/threadqextractwithproxy.c index fcf071a9ae..14653091b3 100644 --- a/cpukit/score/src/threadqextractwithproxy.c +++ b/cpukit/score/src/threadqextractwithproxy.c @@ -41,23 +41,24 @@ boolean _Thread_queue_Extract_with_proxy( ) { States_Control state; - Objects_Information *the_information; - Objects_Thread_queue_Extract_callout proxy_extract_callout; state = the_thread->current_state; if ( _States_Is_waiting_on_thread_queue( state ) ) { - if ( _States_Is_waiting_for_rpc_reply( state ) && - _States_Is_locally_blocked( state ) ) { + #if defined(RTEMS_MULTIPROCESSING) + if ( _States_Is_waiting_for_rpc_reply( state ) && + _States_Is_locally_blocked( state ) ) { + Objects_Information *the_information; + Objects_Thread_queue_Extract_callout proxy_extract_callout; - the_information = _Objects_Get_information( the_thread->Wait.id ); + the_information = _Objects_Get_information( the_thread->Wait.id ); + proxy_extract_callout = + (Objects_Thread_queue_Extract_callout) the_information->extract; - proxy_extract_callout = - (Objects_Thread_queue_Extract_callout) the_information->extract; - - if ( proxy_extract_callout ) - (*proxy_extract_callout)( the_thread ); - } + if ( proxy_extract_callout ) + (*proxy_extract_callout)( the_thread ); + } + #endif _Thread_queue_Extract( the_thread->Wait.queue, the_thread ); return TRUE; |