Changeset 0dc2fec in mainline for uspace/lib/c/generic/fibril.c

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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:

• uspace/lib/c/generic/fibril.c (modified) (1 diff)

uspace/lib/c/generic/fibril.c

@@ -114 +114 @@
         fibril->waits_for = NULL;
 
-        futex_lock(&fibril_futex);
+        /*
+         * We are called before __tcb_set(), so we need to use
+         * futex_down/up() instead of futex_lock/unlock() that
+         * may attempt to access TLS.
+         */
+        futex_down(&fibril_futex);
         list_append(&fibril->all_link, &fibril_list);
-        futex_unlock(&fibril_futex);
+        futex_up(&fibril_futex);
         
         return fibril;