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

Timestamp:

2011-06-01T10:04:32Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

65c3794

Parents:

049a16f (diff), df29f24 (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 with usb/development

File:

• kernel/generic/src/mm/page.c (modified) (5 diffs)

kernel/generic/src/mm/page.c

@@ -112 +112 @@
  * using flags. Allocate and setup any missing page tables.
  *
- * @param as    Address space to wich page belongs.
+ * @param as    Address space to which page belongs.
  * @param page  Virtual address of the page to be mapped.
  * @param frame Physical address of memory frame to which the mapping is
@@ -139 +139 @@
  * this call visible.
  *
- * @param as   Address space to wich page belongs.
+ * @param as   Address space to which page belongs.
  * @param page Virtual address of the page to be demapped.
  *
@@ -156 +156 @@
 }
 
-/** Find mapping for virtual page
- *
- * Find mapping for virtual page.
- *
- * @param as   Address space to wich page belongs.
- * @param page Virtual page.
+/** Find mapping for virtual page.
+ *
+ * @param as     Address space to which page belongs.
+ * @param page   Virtual page.
+ * @param nolock True if the page tables need not be locked.
  *
  * @return NULL if there is no such mapping; requested mapping
@@ -167 +166 @@
  *
  */
-NO_TRACE pte_t *page_mapping_find(as_t *as, uintptr_t page)
-{
-        ASSERT(page_table_locked(as));
+NO_TRACE pte_t *page_mapping_find(as_t *as, uintptr_t page, bool nolock)
+{
+        ASSERT(nolock || page_table_locked(as));
         
         ASSERT(page_mapping_operations);
         ASSERT(page_mapping_operations->mapping_find);
         
-        return page_mapping_operations->mapping_find(as, page);
+        return page_mapping_operations->mapping_find(as, page, nolock);
 }
 
@@ -188 +187 @@
         mutex_lock(&AS->lock);
         
-        pte_t *pte = page_mapping_find(AS, virt_address);
+        pte_t *pte = page_mapping_find(AS, virt_address, true);
         if (!PTE_VALID(pte) || !PTE_PRESENT(pte)) {
                 mutex_unlock(&AS->lock);