diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-01 15:37:30 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-01 15:37:30 +0000 |
| commit | d686006540d927711e7d8a8e0f7e5124e4038e40 (patch) | |
| tree | 30eb83c6e09b70dbea024addc2d129db4a9b54a9 | |
| parent | 2004-11-01 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-d686006540d927711e7d8a8e0f7e5124e4038e40.tar.bz2 | |
2004-11-01 Joel Sherrill <joel@OARcorp.com>
* score/src/coresemsurrender.c, score/src/objectnametoid.c: All
_Objects_Is_Local... should only be called if multiprocessing is
enabled.
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/score/src/coresemsurrender.c | 2 | ||||
| -rw-r--r-- | cpukit/score/src/objectnametoid.c | 9 |
3 files changed, 14 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 43fe2f7e26..89addb9c4f 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2004-11-01 Joel Sherrill <joel@OARcorp.com> + + * score/src/coresemsurrender.c, score/src/objectnametoid.c: All + _Objects_Is_Local... should only be called if multiprocessing is + enabled. + 2004-11-01 Ralf Corsepius <ralf_corsepius@rtems.org> * rtems/include/rtems/rtems/tasks.h, rtems/src/taskstart.c: diff --git a/cpukit/score/src/coresemsurrender.c b/cpukit/score/src/coresemsurrender.c index a5f9d544d6..18f9ab6df7 100644 --- a/cpukit/score/src/coresemsurrender.c +++ b/cpukit/score/src/coresemsurrender.c @@ -57,8 +57,10 @@ CORE_semaphore_Status _CORE_semaphore_Surrender( if ( (the_thread = _Thread_queue_Dequeue(&the_semaphore->Wait_queue)) ) { +#if defined(RTEMS_MULTIPROCESSING) if ( !_Objects_Is_local_id( the_thread->Object.id ) ) (*api_semaphore_mp_support) ( the_thread, id ); +#endif } else { _ISR_Disable( level ); diff --git a/cpukit/score/src/objectnametoid.c b/cpukit/score/src/objectnametoid.c index c5a1a70a9d..33bdc071fb 100644 --- a/cpukit/score/src/objectnametoid.c +++ b/cpukit/score/src/objectnametoid.c @@ -65,8 +65,11 @@ Objects_Name_or_id_lookup_errors _Objects_Name_to_id( search_local_node = FALSE; if ( information->maximum != 0 && - (node == OBJECTS_SEARCH_ALL_NODES || node == OBJECTS_SEARCH_LOCAL_NODE || - _Objects_Is_local_node( node ) ) ) + (node == OBJECTS_SEARCH_ALL_NODES || node == OBJECTS_SEARCH_LOCAL_NODE +#if defined(RTEMS_MULTIPROCESSING) + || _Objects_Is_local_node( node ) +#endif + )) search_local_node = TRUE; if ( search_local_node ) { @@ -87,10 +90,10 @@ Objects_Name_or_id_lookup_errors _Objects_Name_to_id( } } +#if defined(RTEMS_MULTIPROCESSING) if ( _Objects_Is_local_node( node ) || node == OBJECTS_SEARCH_LOCAL_NODE ) return OBJECTS_INVALID_NAME; -#if defined(RTEMS_MULTIPROCESSING) return ( _Objects_MP_Global_name_search( information, name, node, id ) ); #else return OBJECTS_INVALID_NAME; |