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

Timestamp:

2015-06-17T23:45:24Z (9 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

523b17a

Parents:

fc7bf19 (diff), 2654afb (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:

Sync with mainline

File:

• kernel/generic/src/synch/futex.c (modified) (1 diff)

kernel/generic/src/synch/futex.c

@@ -400 +400 @@
                 return (sysarg_t) ENOENT;
 
+#ifdef CONFIG_UDEBUG
+        udebug_stoppable_begin();
+#endif
+
         int rc = waitq_sleep_timeout(&futex->wq, 0, SYNCH_FLAGS_INTERRUPTIBLE); 
+
+#ifdef CONFIG_UDEBUG
+        udebug_stoppable_end();
+#endif
 
         return (sysarg_t) rc;