Changeset 6843a9c in mainline for kernel/generic/src/lib/elf.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:

• kernel/generic/src/lib/elf.c (modified) (1 diff)

kernel/generic/src/lib/elf.c

@@ -226 +226 @@
         size_t mem_sz = entry->p_memsz + (entry->p_vaddr - base);
         
-        as_area_t *area = as_area_create(as, flags, mem_sz, base,
-            AS_AREA_ATTR_NONE, &elf_backend, &backend_data);
+        as_area_t *area = as_area_create(as, flags, mem_sz,
+            AS_AREA_ATTR_NONE, &elf_backend, &backend_data, &base, 0);
         if (!area)
                 return EE_MEMORY;