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

Timestamp:

2016-09-01T17:05:13Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

42d08592

Parents:

f126c87 (diff), fb63c06 (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:~jakub/helenos/pt

File:

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

kernel/generic/src/synch/futex.c

@@ -291 +291 @@
         spinlock_lock(&futex_ht_lock);
 
-        bool found = false;
-        pte_t *t = page_mapping_find(AS, ALIGN_DOWN(uaddr, PAGE_SIZE), true);
-        
-        if (t && PTE_VALID(t) && PTE_PRESENT(t)) {
-                found = true;
-                *paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
+        bool success = false;
+
+        pte_t t;
+        bool found;
+
+        found = page_mapping_find(AS, ALIGN_DOWN(uaddr, PAGE_SIZE), true, &t);
+        if (found && PTE_VALID(&t) && PTE_PRESENT(&t)) {
+                success = true;
+                *paddr = PTE_GET_FRAME(&t) +
+                    (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
         }
         
@@ -302 +306 @@
         page_table_unlock(AS, false);
         
-        return found;
+        return success;
 }