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

Timestamp:

2011-08-03T17:34:57Z (15 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 mainline

File:

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

kernel/generic/src/synch/futex.c

@@ -119 +119 @@
          */
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, ALIGN_DOWN(uaddr, PAGE_SIZE));
+        t = page_mapping_find(AS, ALIGN_DOWN(uaddr, PAGE_SIZE), false);
         if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
                 page_table_unlock(AS, true);
@@ -155 +155 @@
          */
         page_table_lock(AS, true);
-        t = page_mapping_find(AS, ALIGN_DOWN(uaddr, PAGE_SIZE));
+        t = page_mapping_find(AS, ALIGN_DOWN(uaddr, PAGE_SIZE), false);
         if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
                 page_table_unlock(AS, true);
@@ -272 +272 @@
 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;