Changeset a33f0a6 in mainline for kernel/generic/src/mm/backend_elf.c

Timestamp:

2011-08-03T17:34:57Z (15 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 from mainline

File:

• kernel/generic/src/mm/backend_elf.c (modified) (4 diffs)

kernel/generic/src/mm/backend_elf.c

@@ -139 +139 @@
          */
         if (area->flags & AS_AREA_WRITE) {
-                node = list_get_instance(area->used_space.leaf_head.next,
+                node = list_get_instance(list_first(&area->used_space.leaf_list),
                     btree_node_t, leaf_link);
         } else {
@@ -153 +153 @@
          */
         mutex_lock(&area->sh_info->lock);
-        for (cur = &node->leaf_link; cur != &area->used_space.leaf_head;
+        for (cur = &node->leaf_link; cur != &area->used_space.leaf_list.head;
             cur = cur->next) {
                 unsigned int i;
@@ -170 +170 @@
                         if (!(area->flags & AS_AREA_WRITE))
                                 if (base >= entry->p_vaddr &&
-                                    base + count * PAGE_SIZE <= start_anon)
+                                    base + P2SZ(count) <= start_anon)
                                         continue;
                         
@@ -182 +182 @@
                                 if (!(area->flags & AS_AREA_WRITE))
                                         if (base >= entry->p_vaddr &&
-                                            base + (j + 1) * PAGE_SIZE <=
-                                            start_anon)
+                                            base + P2SZ(j + 1) <= start_anon)
                                                 continue;
                                 
                                 page_table_lock(area->as, false);
                                 pte = page_mapping_find(area->as,
-                                    base + j * PAGE_SIZE);
+                                    base + P2SZ(j), false);
                                 ASSERT(pte && PTE_VALID(pte) &&
                                     PTE_PRESENT(pte));
                                 btree_insert(&area->sh_info->pagemap,
-                                    (base + j * PAGE_SIZE) - area->base,
+                                    (base + P2SZ(j)) - area->base,
                                     (void *) PTE_GET_FRAME(pte), NULL);
                                 page_table_unlock(area->as, false);