Changeset d9d0088 in mainline

Timestamp:

2018-11-07T15:17:05Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cd1ecf11

Parents:

88cc71c0

git-author:

Jiri Svoboda <jiri@…> (2018-10-07 07:15:55)

git-committer:

Jiri Svoboda <jiri@…> (2018-11-07 15:17:05)

Message:

Fix case where no area has lower or equal base. Remove duplicate alignment.

File:

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

kernel/generic/src/mm/as.c

@@ -403 +403 @@
         }
 
-        /* Next area, if any, is the first with base > than our base address */
+        /*
+         * Next area, if any, is the first with base > than our base address.
+         * If there was no area with <= base, we need to look at the first area.
+         */
+        if (odlink == NULL)
+                odlink = odict_first(&as->as_areas);
+
         if (odlink != NULL) {
                 as_area_t *area = odict_get_instance(odlink, as_area_t,
@@ -487 +493 @@
                 mutex_lock(&area->lock);
 
-                addr = ALIGN_UP(area->base + P2SZ(area->pages), PAGE_SIZE);
+                addr = area->base + P2SZ(area->pages);
 
                 if (guarded || area->flags & AS_AREA_GUARD) {