Changeset 6843a9c in mainline for kernel/generic/src/main/uinit.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/main/uinit.c (modified) (2 diffs)

kernel/generic/src/main/uinit.c

@@ -56 +56 @@
 void uinit(void *arg)
 {
-        uspace_arg_t uarg;
-        
         /*
          * So far, we don't have a use for joining userspace threads so we
@@ -72 +70 @@
 #endif
         
-        uarg.uspace_entry = ((uspace_arg_t *) arg)->uspace_entry;
-        uarg.uspace_stack = ((uspace_arg_t *) arg)->uspace_stack;
-        uarg.uspace_uarg = ((uspace_arg_t *) arg)->uspace_uarg;
-        uarg.uspace_thread_function = NULL;
-        uarg.uspace_thread_arg = NULL;
+        uspace_arg_t *uarg = (uspace_arg_t *) arg;
+        uspace_arg_t local_uarg;
         
-        free((uspace_arg_t *) arg);
+        local_uarg.uspace_entry = uarg->uspace_entry;
+        local_uarg.uspace_stack = uarg->uspace_stack;
+        local_uarg.uspace_stack_size = uarg->uspace_stack_size;
+        local_uarg.uspace_uarg = uarg->uspace_uarg;
+        local_uarg.uspace_thread_function = NULL;
+        local_uarg.uspace_thread_arg = NULL;
         
-        userspace(&uarg);
+        free(uarg);
+        
+        userspace(&local_uarg);
 }