Changeset 92574f4 in mainline for kernel/generic/src/proc/program.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• kernel/generic/src/proc/program.c (modified) (2 diffs)

kernel/generic/src/proc/program.c

@@ -171 +171 @@
         void *loader = program_loader;
         if (!loader) {
+                as_destroy(as);
                 printf("Cannot spawn loader as none was registered\n");
                 return ENOENT;
@@ -179 +180 @@
         if (rc != EE_OK) {
                 as_destroy(as);
+                printf("Cannot spawn loader (%s)\n", elf_error(rc));
                 return ENOENT;
         }