Changeset c6588ce in mainline for kernel/generic/src/mm/page.c

Timestamp:

2012-05-05T08:12:17Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (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/mm/page.c (modified) (2 diffs)

kernel/generic/src/mm/page.c

@@ -168 +168 @@
 int page_find_mapping(uintptr_t virt, void **phys)
 {
-        mutex_lock(&AS->lock);
+        page_table_lock(AS, true);
         
         pte_t *pte = page_mapping_find(AS, virt, false);
         if ((!PTE_VALID(pte)) || (!PTE_PRESENT(pte))) {
-                mutex_unlock(&AS->lock);
+                page_table_unlock(AS, true);
                 return ENOENT;
         }
@@ -179 +179 @@
             (virt - ALIGN_DOWN(virt, PAGE_SIZE));
         
-        mutex_unlock(&AS->lock);
+        page_table_unlock(AS, true);
         
         return EOK;