RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2004-11-01 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* score/src/coresemsurrender.c, score/src/objectnametoid.c: All
	_Objects_Is_Local... should only be called if multiprocessing is
	enabled.
This commit is contained in:
Joel Sherrill
2004-11-01 15:37:30 +00:00
parent c7b7f38098
commit d686006540
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/ChangeLog
View File

@@ -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> 2004-11-01 Ralf Corsepius <ralf_corsepius@rtems.org>
* rtems/include/rtems/rtems/tasks.h, rtems/src/taskstart.c: * rtems/include/rtems/rtems/tasks.h, rtems/src/taskstart.c:

2
cpukit/score/src/coresemsurrender.c
View File

@@ -57,8 +57,10 @@ CORE_semaphore_Status _CORE_semaphore_Surrender(
if ( (the_thread = _Thread_queue_Dequeue(&the_semaphore->Wait_queue)) ) { if ( (the_thread = _Thread_queue_Dequeue(&the_semaphore->Wait_queue)) ) {
#if defined(RTEMS_MULTIPROCESSING)
if ( !_Objects_Is_local_id( the_thread->Object.id ) ) if ( !_Objects_Is_local_id( the_thread->Object.id ) )
(*api_semaphore_mp_support) ( the_thread, id ); (*api_semaphore_mp_support) ( the_thread, id );
#endif
} else { } else {
_ISR_Disable( level ); _ISR_Disable( level );

9
cpukit/score/src/objectnametoid.c
View File

@@ -65,8 +65,11 @@ Objects_Name_or_id_lookup_errors _Objects_Name_to_id(
search_local_node = FALSE; search_local_node = FALSE;
if ( information->maximum != 0 && if ( information->maximum != 0 &&
(node == OBJECTS_SEARCH_ALL_NODES || node == OBJECTS_SEARCH_LOCAL_NODE || (node == OBJECTS_SEARCH_ALL_NODES || node == OBJECTS_SEARCH_LOCAL_NODE
_Objects_Is_local_node( node ) ) ) #if defined(RTEMS_MULTIPROCESSING)
|| _Objects_Is_local_node( node )
#endif
))
search_local_node = TRUE; search_local_node = TRUE;
if ( search_local_node ) { 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 ) if ( _Objects_Is_local_node( node ) || node == OBJECTS_SEARCH_LOCAL_NODE )
return OBJECTS_INVALID_NAME; return OBJECTS_INVALID_NAME;
#if defined(RTEMS_MULTIPROCESSING)
return ( _Objects_MP_Global_name_search( information, name, node, id ) ); return ( _Objects_MP_Global_name_search( information, name, node, id ) );
#else #else
return OBJECTS_INVALID_NAME; return OBJECTS_INVALID_NAME;