Changeset b1c57a8 in mainline for kernel/generic/src/proc/task.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:

• kernel/generic/src/proc/task.c (modified) (5 diffs)

kernel/generic/src/proc/task.c

@@ -41 +41 @@
 #include <mm/slab.h>
 #include <atomic.h>
+#include <synch/futex.h>
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
@@ -163 +164 @@
         
         irq_spinlock_initialize(&task->lock, "task_t_lock");
-        mutex_initialize(&task->futexes_lock, MUTEX_PASSIVE);
         
         list_initialize(&task->threads);
@@ -175 +175 @@
         spinlock_initialize(&task->active_calls_lock, "active_calls_lock");
         list_initialize(&task->active_calls);
-        
+                
 #ifdef CONFIG_UDEBUG
         /* Init kbox stuff */
@@ -231 +231 @@
                 (void) ipc_phone_connect(&task->phones[0], ipc_phone_0);
         
-        btree_create(&task->futexes);
+        futex_task_init(task);
         
         /*
@@ -272 +272 @@
          * Free up dynamically allocated state.
          */
-        btree_destroy(&task->futexes);
+        futex_task_deinit(task);
         
         /*