Changeset 06b0211b in mainline for kernel/generic/src/mm/backend_phys.c

Timestamp:

2013-04-29T11:29:45Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

aa2b32c

Parents:

ba4799a (diff), df956b9b (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/backend_phys.c (modified) (3 diffs)

kernel/generic/src/mm/backend_phys.c

@@ -111 +111 @@
  *
  * @param area Pointer to the address space area.
- * @param addr Faulting virtual address.
+ * @param upage Faulting virtual page.
  * @param access Access mode that caused the fault (i.e. read/write/exec).
  *
@@ -117 +117 @@
  * serviced).
  */
-int phys_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
+int phys_page_fault(as_area_t *area, uintptr_t upage, pf_access_t access)
 {
         uintptr_t base = area->backend_data.base;
@@ -123 +123 @@
         ASSERT(page_table_locked(AS));
         ASSERT(mutex_locked(&area->lock));
+        ASSERT(IS_ALIGNED(upage, PAGE_SIZE));
 
         if (!as_area_check_access(area, access))
                 return AS_PF_FAULT;
 
-        ASSERT(addr - area->base < area->backend_data.frames * FRAME_SIZE);
-        page_mapping_insert(AS, addr, base + (addr - area->base),
+        ASSERT(upage - area->base < area->backend_data.frames * FRAME_SIZE);
+        page_mapping_insert(AS, upage, base + (upage - area->base),
             as_area_get_flags(area));
         
-        if (!used_space_insert(area, ALIGN_DOWN(addr, PAGE_SIZE), 1))
+        if (!used_space_insert(area, upage, 1))
                 panic("Cannot insert used space.");