summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/score/src/objectgetinfo.c14
2 files changed, 16 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index d5e543a055..20ca000d49 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,10 @@
2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * score/src/objectgetinfo.c: Correct for multiprocessor systems when
+ all object instances within a particular class are remote.
+
+2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* libcsupport/src/assocnamebad.c: Correct file name in message.
2008-09-05 Joel Sherrill <joel.sherrill@OARcorp.com>
diff --git a/cpukit/score/src/objectgetinfo.c b/cpukit/score/src/objectgetinfo.c
index 033f827891..de13fa1998 100644
--- a/cpukit/score/src/objectgetinfo.c
+++ b/cpukit/score/src/objectgetinfo.c
@@ -33,7 +33,8 @@ Objects_Information *_Objects_Get_information(
return NULL;
the_class_api_maximum = _Objects_API_maximum_class( the_api );
- if ( the_class_api_maximum < 0 || the_class > (uint32_t) the_class_api_maximum )
+ if ( the_class_api_maximum < 0 ||
+ the_class > (uint32_t) the_class_api_maximum )
return NULL;
if ( !_Objects_Information_table[ the_api ] )
@@ -43,8 +44,15 @@ Objects_Information *_Objects_Get_information(
if ( !info )
return NULL;
- if ( info->maximum == 0 )
- return NULL;
+ /*
+ * In a multprocessing configuration, we may access remote objects.
+ * Thus we may have 0 local instances and still have a valid object
+ * pointer.
+ */
+ #if !defined(RTEMS_MULTIPROCESSING)
+ if ( info->maximum == 0 )
+ return NULL;
+ #endif
return info;
}