Changeset 6843a9c in mainline for uspace/app/tester/mm/common.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/app/tester/mm/common.c (modified) (1 diff)

uspace/app/tester/mm/common.c

@@ -342 +342 @@
         link_initialize(&area->link);
         
-        /* Map the memory area */
-        void *addr = as_get_mappable_page(size);
-        if (addr == NULL) {
+        area->addr = as_area_create(AS_AREA_ANY, size,
+            AS_AREA_WRITE | AS_AREA_READ);
+        if (area->addr == AS_MAP_FAILED) {
                 free(area);
                 check_consistency("map_area (a)");
-                return NULL;
-        }
-        
-        area->addr = as_area_create(addr, size, AS_AREA_WRITE | AS_AREA_READ);
-        if (area->addr == (void *) -1) {
-                free(area);
-                check_consistency("map_area (b)");
                 return NULL;
         }