Changeset b4ca0a9c in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2012-07-10T11:53:50Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (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:

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

uspace/lib/c/generic/malloc.c

@@ -285 +285 @@
         /* Align the heap area size on page boundary */
         size_t asize = ALIGN_UP(size, PAGE_SIZE);
-        void *astart = as_area_create((void *) -1, asize,
+        void *astart = as_area_create(AS_AREA_ANY, asize,
             AS_AREA_WRITE | AS_AREA_READ);
-        if (astart == (void *) -1)
+        if (astart == AS_MAP_FAILED)
                 return false;