Changeset 06b0211b in mainline for kernel/generic/src/mm/backend_elf.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_elf.c (modified) (4 diffs)

kernel/generic/src/mm/backend_elf.c

@@ -235 +235 @@
  *
  * @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).
@@ -242 +242 @@
  *                      on success (i.e. serviced).
  */
-int elf_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access)
+int elf_page_fault(as_area_t *area, uintptr_t upage, pf_access_t access)
 {
         elf_header_t *elf = area->backend_data.elf;
@@ -250 +250 @@
         uintptr_t frame;
         uintptr_t kpage;
-        uintptr_t upage;
         uintptr_t start_anon;
         size_t i;
@@ -257 +256 @@
         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;
         
-        if (addr < ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE))
+        if (upage < ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE))
                 return AS_PF_FAULT;
         
-        if (addr >= entry->p_vaddr + entry->p_memsz)
+        if (upage >= entry->p_vaddr + entry->p_memsz)
                 return AS_PF_FAULT;
         
-        i = (addr - ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) >> PAGE_WIDTH;
+        i = (upage - ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) >> PAGE_WIDTH;
         base = (uintptr_t)
             (((void *) elf) + ALIGN_DOWN(entry->p_offset, PAGE_SIZE));
-
-        /* Virtual address of faulting page */
-        upage = ALIGN_DOWN(addr, PAGE_SIZE);
 
         /* Virtual address of the end of initialized part of segment */