Changeset 6843a9c in mainline for uspace/lib/c/generic/elf/elf_load.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/elf/elf_load.c (modified) (1 diff)

uspace/lib/c/generic/elf/elf_load.c

@@ -364 +364 @@
          * and writeable.
          */
-        a = as_area_create((uint8_t *)base + bias, mem_sz,
+        a = as_area_create((uint8_t *) base + bias, mem_sz,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
-        if (a == (void *)(-1)) {
+        if (a == AS_MAP_FAILED) {
                 DPRINTF("memory mapping failed (0x%x, %d)\n",
-                        base+bias, mem_sz);
+                    base + bias, mem_sz);
                 return EE_MEMORY;
         }