Changeset b1c57a8 in mainline for uspace/lib/c/generic/libc.c

Timestamp:

2014-10-09T15:03:55Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (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 from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:

• uspace/lib/c/generic/libc.c (modified) (3 diffs)

uspace/lib/c/generic/libc.c

@@ -52 +52 @@
 #include "private/io.h"
 
+#ifdef FUTEX_UPGRADABLE
+#include <rcu.h>
+#endif
+
 #ifdef CONFIG_RTLD
 #include <rtld/rtld.h>
 #endif
+
 
 static bool env_setup = false;
@@ -62 +67 @@
         /* Initialize user task run-time environment */
         __malloc_init();
-        __async_init();
         
         fibril_t *fibril = fibril_setup();
@@ -72 +76 @@
         /* Save the PCB pointer */
         __pcb = (pcb_t *) pcb_ptr;
+        
+#ifdef FUTEX_UPGRADABLE
+        rcu_register_fibril();
+#endif
+        
+        __async_init();
         
         /* The basic run-time environment is setup */