Changeset 850235d in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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) (2 diffs)

uspace/lib/c/generic/malloc.c

@@ -35 +35 @@
 
 #include <malloc.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <as.h>
 #include <align.h>
@@ -289 +289 @@
         size_t asize = ALIGN_UP(size, PAGE_SIZE);
         void *astart = as_area_create(AS_AREA_ANY, asize,
-            AS_AREA_WRITE | AS_AREA_READ);
+            AS_AREA_WRITE | AS_AREA_READ | AS_AREA_CACHEABLE);
         if (astart == AS_MAP_FAILED)
                 return false;