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

Timestamp:

2010-12-30T13:43:27Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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) (2 diffs)

kernel/generic/src/proc/program.c

@@ -210 +210 @@
  *
  */
-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 +219 @@
         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;