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

Timestamp:

2011-05-12T16:49:44Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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:

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

kernel/generic/src/proc/program.c

@@ -145 +145 @@
                 
                 program_loader = image_addr;
-                LOG("Registered program loader at 0x%" PRIp,
-                    image_addr);
+                LOG("Registered program loader at %p",
+                    (void *) image_addr);
                 
                 return EOK;
@@ -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;
         }
@@ -210 +212 @@
  *
  */
-unative_t sys_program_spawn_loader(char *uspace_name, size_t name_len)
+sysarg_t sys_program_spawn_loader(char *uspace_name, size_t name_len)
 {
         /* Cap length of name and copy it from userspace. */
@@ -219 +221 @@
         int rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         namebuf[name_len] = 0;