diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-11-17 22:59:41 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2006-11-17 22:59:41 +0000 |
| commit | 7f3d6fe91c9579bee875344e7c18d1daec7116a3 (patch) | |
| tree | 6098d17023f344306f110dc1963cffabb65882e8 /cpukit | |
| parent | 2006-11-17 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-7f3d6fe91c9579bee875344e7c18d1daec7116a3.tar.bz2 | |
2006-11-17 Joel Sherrill <joel@OARcorp.com>
* score/inline/rtems/score/object.inl, score/src/objectnametoid.c:
Properly honor searching only local node even when on single CPU
system.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/score/inline/rtems/score/object.inl | 2 | ||||
| -rw-r--r-- | cpukit/score/src/objectnametoid.c | 7 |
3 files changed, 9 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 9375525fc1..0f62090418 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,11 @@ 2006-11-17 Joel Sherrill <joel@OARcorp.com> + * score/inline/rtems/score/object.inl, score/src/objectnametoid.c: + Properly honor searching only local node even when on single CPU + system. + +2006-11-17 Joel Sherrill <joel@OARcorp.com> + * score/src/coresemseize.c: Add missing ISR enable. 2006-11-17 Joel Sherrill <joel@OARcorp.com> diff --git a/cpukit/score/inline/rtems/score/object.inl b/cpukit/score/inline/rtems/score/object.inl index e3e17bdb69..a70d7ddadc 100644 --- a/cpukit/score/inline/rtems/score/object.inl +++ b/cpukit/score/inline/rtems/score/object.inl @@ -116,7 +116,6 @@ RTEMS_INLINE_ROUTINE boolean _Objects_Is_class_valid( return TRUE; /* the_class && the_class <= OBJECTS_CLASSES_LAST; */ } -#if defined(RTEMS_MULTIPROCESSING) /** * This function returns TRUE if the node is of the local object, and * FALSE otherwise. @@ -133,7 +132,6 @@ RTEMS_INLINE_ROUTINE boolean _Objects_Is_local_node( { return ( node == _Objects_Local_node ); } -#endif /** * This function returns TRUE if the id is of a local object, and diff --git a/cpukit/score/src/objectnametoid.c b/cpukit/score/src/objectnametoid.c index 533c4b0ec4..03e9d1da28 100644 --- a/cpukit/score/src/objectnametoid.c +++ b/cpukit/score/src/objectnametoid.c @@ -69,10 +69,9 @@ 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 -#if defined(RTEMS_MULTIPROCESSING) - || _Objects_Is_local_node( node ) -#endif + (node == OBJECTS_SEARCH_ALL_NODES || + node == OBJECTS_SEARCH_LOCAL_NODE || + _Objects_Is_local_node( node ) )) search_local_node = TRUE; |