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

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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:

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

kernel/generic/src/synch/futex.c

@@ -39 +39 @@
 #include <synch/mutex.h>
 #include <synch/spinlock.h>
-#include <synch/synch.h>
 #include <mm/frame.h>
 #include <mm/page.h>
@@ -272 +271 @@
 void futex_cleanup(void)
 {
-        link_t *cur;
-        
         mutex_lock(&futex_ht_lock);
         mutex_lock(&TASK->futexes_lock);
 
-        for (cur = TASK->futexes.leaf_head.next;
-            cur != &TASK->futexes.leaf_head; cur = cur->next) {
+        list_foreach(TASK->futexes.leaf_list, cur) {
                 btree_node_t *node;
                 unsigned int i;