Changeset 132ab5d1 in mainline for kernel/generic/src/synch/futex.c

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/src/synch/futex.c (modified) (3 diffs)

kernel/generic/src/synch/futex.c

@@ -395 +395 @@
  *
  * @return              If there is no physical mapping for uaddr ENOENT is
- *                      returned. Otherwise returns a wait result as defined in
- *                      synch.h.
+ *                      returned. Otherwise returns the return value of
+ *                      waitq_sleep_timeout().
  */
 sysarg_t sys_futex_sleep(uintptr_t uaddr)
@@ -409 +409 @@
 #endif
 
-        int rc = waitq_sleep_timeout(&futex->wq, 0, SYNCH_FLAGS_INTERRUPTIBLE); 
+        int rc = waitq_sleep_timeout(
+            &futex->wq, 0, SYNCH_FLAGS_INTERRUPTIBLE, NULL);
 
 #ifdef CONFIG_UDEBUG
@@ -430 +431 @@
         if (futex) {
                 waitq_wakeup(&futex->wq, WAKEUP_FIRST);
-                return 0;
+                return EOK;
         } else {
                 return (sysarg_t) ENOENT;