Changeset 6843a9c in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/c/generic/malloc.c (modified) (1 diff)

uspace/lib/c/generic/malloc.c

@@ -283 +283 @@
 static bool area_create(size_t size)
 {
-        void *start = as_get_mappable_page(size);
-        if (start == NULL)
-                return false;
-        
-        /* Align the heap area on page boundary */
-        void *astart = (void *) ALIGN_UP((uintptr_t) start, PAGE_SIZE);
+        /* Align the heap area size on page boundary */
         size_t asize = ALIGN_UP(size, PAGE_SIZE);
-        
-        astart = as_area_create(astart, asize, AS_AREA_WRITE | AS_AREA_READ);
-        if (astart == (void *) -1)
+        void *astart = as_area_create(AS_AREA_ANY, asize,
+            AS_AREA_WRITE | AS_AREA_READ);
+        if (astart == AS_MAP_FAILED)
                 return false;