Changeset 90478727 in mainline for uspace/lib/c/generic/elf/elf_load.c

Timestamp:

2012-08-12T11:46:44Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

41b764b7

Parents:

e1e4192 (diff), 371cb6c (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/elf/elf_load.c (modified) (1 diff)

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

@@ -366 +366 @@
         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);