Changeset 49ff5f3 in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2012-04-18T20:55:21Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7769ec9

Parents:

e895352 (diff), 63920b0 (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

@@ -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);
+        void *astart = as_area_create((void *) -1, asize,
+            AS_AREA_WRITE | AS_AREA_READ);
         if (astart == (void *) -1)
                 return false;