Changeset 132ab5d1 in mainline for kernel/generic/include/synch/semaphore.h

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• kernel/generic/include/synch/semaphore.h (modified) (2 diffs)

kernel/generic/include/synch/semaphore.h

@@ -36 +36 @@
 #define KERN_SEMAPHORE_H_
 
+#include <errno.h>
 #include <stdint.h>
 #include <synch/waitq.h>
@@ -54 +55 @@
 
 #define semaphore_down_interruptable(s) \
-        (ESYNCH_INTERRUPTED != _semaphore_down_timeout((s), SYNCH_NO_TIMEOUT, \
-                SYNCH_FLAGS_INTERRUPTIBLE))
+        (_semaphore_down_timeout((s), SYNCH_NO_TIMEOUT, \
+                SYNCH_FLAGS_INTERRUPTIBLE) != EINTR)
 
 extern void semaphore_initialize(semaphore_t *, int);