Changeset b2fa2d86 in mainline for kernel/generic/src/mm/backend_anon.c

Timestamp:

2013-03-26T15:06:35Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea15a89a

Parents:

8a26f82 (diff), 5c4356b (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_anon.c (modified) (3 diffs)

kernel/generic/src/mm/backend_anon.c

@@ -173 +173 @@
  *
  * @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).
  *
@@ -179 +179 @@
  *     serviced).
  */
-int anon_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
-{
-        uintptr_t upage = ALIGN_DOWN(addr, PAGE_SIZE);
+int anon_page_fault(as_area_t *area, uintptr_t upage, pf_access_t access)
+{
         uintptr_t kpage;
         uintptr_t frame;
@@ -187 +186 @@
         ASSERT(page_table_locked(AS));
         ASSERT(mutex_locked(&area->lock));
+        ASSERT(IS_ALIGNED(upage, PAGE_SIZE));
 
         if (!as_area_check_access(area, access))