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

Timestamp:

2011-05-22T20:05:26Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

34efa8a

Parents:

9ea8fdb4 (diff), 2bdf8313 (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 lp:~jakub/helenos/mm.

File:

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

kernel/generic/src/mm/backend_elf.c

@@ -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);