Changeset 25a76ab8 in mainline for kernel/generic/src/synch/mutex.c
- Timestamp:
- 2010-05-08T07:53:23Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 051bc69a
- Parents:
- 6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/synch/mutex.c
r6c39a907 r25a76ab8 40 40 #include <synch/synch.h> 41 41 #include <debug.h> 42 #include <arch.h> 42 43 43 44 /** Initialize mutex. … … 69 70 int rc; 70 71 71 if (mtx->type == MUTEX_PASSIVE ) {72 if (mtx->type == MUTEX_PASSIVE && THREAD) { 72 73 rc = _semaphore_down_timeout(&mtx->sem, usec, flags); 73 74 } else { 74 ASSERT(mtx->type == MUTEX_ACTIVE );75 ASSERT(mtx->type == MUTEX_ACTIVE || !THREAD); 75 76 ASSERT(usec == SYNCH_NO_TIMEOUT); 76 77 ASSERT(!(flags & SYNCH_FLAGS_INTERRUPTIBLE));
Note:
See TracChangeset
for help on using the changeset viewer.