summaryrefslogtreecommitdiffstats
path: root/cpukit/score/src/objectgetisr.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-04 09:42:15 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-06 09:08:22 +0200
commit84f5c0a91be7b1ce9c4f1fb1f7afba680d5451aa (patch)
tree0a348e454beddcdbfeb88e19f523c82fa4c43d00 /cpukit/score/src/objectgetisr.c
parentscore: Use red-black tree for active MP proxies (diff)
downloadrtems-84f5c0a91be7b1ce9c4f1fb1f7afba680d5451aa.tar.bz2
score: Use red-black tree for active global objects
Use a red-black tree to lookup active global objects by identifier or name. Update #2555.
Diffstat (limited to 'cpukit/score/src/objectgetisr.c')
-rw-r--r--cpukit/score/src/objectgetisr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpukit/score/src/objectgetisr.c b/cpukit/score/src/objectgetisr.c
index b1212ac9c7..3a185ce125 100644
--- a/cpukit/score/src/objectgetisr.c
+++ b/cpukit/score/src/objectgetisr.c
@@ -42,12 +42,12 @@ Objects_Control *_Objects_Get_isr_disable(
*location = OBJECTS_ERROR;
return NULL;
}
- *location = OBJECTS_ERROR;
#if defined(RTEMS_MULTIPROCESSING)
- _Objects_MP_Is_remote( information, id, location, &the_object );
- return the_object;
+ *location = _Objects_MP_Is_remote( information, id );
#else
- return NULL;
+ *location = OBJECTS_ERROR;
#endif
+
+ return NULL;
}