Changes in kernel/generic/src/synch/futex.c [b7fd2a0:82cbf8c6] in mainline

File:

• kernel/generic/src/synch/futex.c (modified) (5 diffs)

kernel/generic/src/synch/futex.c

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