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

Timestamp:

2013-09-12T07:54:05Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

95027b5

Parents:

47f5a77 (diff), 64f3d3b (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) (1 diff)

kernel/generic/src/synch/futex.c

@@ -274 +274 @@
         mutex_lock(&TASK->futexes_lock);
 
-        list_foreach(TASK->futexes.leaf_list, cur) {
-                btree_node_t *node;
+        list_foreach(TASK->futexes.leaf_list, leaf_link, btree_node_t, node) {
                 unsigned int i;
                 
-                node = list_get_instance(cur, btree_node_t, leaf_link);
                 for (i = 0; i < node->keys; i++) {
                         futex_t *ftx;