summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog4
-rw-r--r--cpukit/score/src/objectget.c13
2 files changed, 5 insertions, 12 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index f75577b607..14aae69217 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,9 @@
2007-12-17 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * score/src/objectget.c: Revert.
+
+2007-12-17 Joel Sherrill <joel.sherrill@OARcorp.com>
+
* posix/src/timergettime.c: Include rtems/score/timespec.h
2007-12-17 Joel Sherrill <joel.sherrill@OARcorp.com>
diff --git a/cpukit/score/src/objectget.c b/cpukit/score/src/objectget.c
index f1f0e3503a..d0414113eb 100644
--- a/cpukit/score/src/objectget.c
+++ b/cpukit/score/src/objectget.c
@@ -59,18 +59,7 @@ Objects_Control *_Objects_Get(
index = id - information->minimum_id + 1;
-#if 0
-#if defined(RTEMS_MULTIPROCESSING)
- index = id - information->minimum_id + 1;
-#else
- /* index = _Objects_Get_index( id ); */
- index = id & 0x0000ffff;
- /* This should work but doesn't always :( */
- /* index = (uint16_t) id; */
-#endif
-#endif
-
- if ( information->maximum >= index ) {
+ if ( information->maximum >= index ) {
_Thread_Disable_dispatch();
if ( (the_object = information->local_table[ index ]) != NULL ) {
*location = OBJECTS_LOCAL;