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

Timestamp:

2018-04-30T20:12:50Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

4c5f04f (diff), 64d38cd (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-04-30 20:12:50)

git-committer:

GitHub <noreply@…> (2018-04-30 20:12:50)

Message:

Merge 64d38cd33ec6817c3a5fdd1a7da6d705b0d9d3a2 into 4c5f04f66aa0d34ff3bbed6e9abebf85f59723fb

File:

• uspace/lib/c/generic/elf/elf_load.c (modified) (1 diff)

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

@@ -62 +62 @@
         int rc;
 
-        rc = elf_load_file(file, 0, 0, &info->finfo);
+        rc = elf_load_file(file, 0, &info->finfo);
         if (rc != EE_OK) {
                 DPRINTF("Failed to load executable '%s'.\n", file_name);