Changeset 25a76ab8 in mainline for kernel/generic/src/synch/mutex.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

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.

Message:

Merge mainline changes.

File:

• kernel/generic/src/synch/mutex.c (modified) (2 diffs)

kernel/generic/src/synch/mutex.c

@@ -40 +40 @@
 #include <synch/synch.h>
 #include <debug.h>
+#include <arch.h>
 
 /** Initialize mutex.
@@ -69 +70 @@
         int rc;
 
-        if (mtx->type == MUTEX_PASSIVE) {
+        if (mtx->type == MUTEX_PASSIVE && THREAD) {
                 rc = _semaphore_down_timeout(&mtx->sem, usec, flags);
         } else {
-                ASSERT(mtx->type == MUTEX_ACTIVE);
+                ASSERT(mtx->type == MUTEX_ACTIVE || !THREAD);
                 ASSERT(usec == SYNCH_NO_TIMEOUT);
                 ASSERT(!(flags & SYNCH_FLAGS_INTERRUPTIBLE));