summaryrefslogtreecommitdiffstats
path: root/cpukit/score/src/objectnametoid.c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2004-11-01 15:37:30 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2004-11-01 15:37:30 +0000
commitd686006540d927711e7d8a8e0f7e5124e4038e40 (patch)
tree30eb83c6e09b70dbea024addc2d129db4a9b54a9 /cpukit/score/src/objectnametoid.c
parent2004-11-01 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-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.
Diffstat (limited to 'cpukit/score/src/objectnametoid.c')
-rw-r--r--cpukit/score/src/objectnametoid.c9
1 files changed, 6 insertions, 3 deletions
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;