Changeset 82d56184 in mainline for kernel/generic/src/main/uinit.c

Timestamp:

2011-06-01T21:05:19Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5cac9cd

Parents:

682cfceb (diff), 5d1b3aa (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/main/uinit.c (modified) (6 diffs)

kernel/generic/src/main/uinit.c

@@ -33 +33 @@
 /**
  * @file
- * @brief       Userspace bootstrap thread.
+ * @brief Userspace bootstrap thread.
  *
  * This file contains uinit kernel thread wich is used to start every
@@ -40 +40 @@
  * @see SYS_THREAD_CREATE
  */
- 
+
 #include <main/uinit.h>
 #include <typedefs.h>
@@ -48 +48 @@
 #include <arch.h>
 #include <udebug/udebug.h>
-
 
 /** Thread used to bring up userspace thread.
@@ -58 +57 @@
 {
         uspace_arg_t uarg;
-
+        
         /*
          * So far, we don't have a use for joining userspace threads so we
@@ -68 +67 @@
          */
         thread_detach(THREAD);
-
+        
 #ifdef CONFIG_UDEBUG
         udebug_stoppable_end();
@@ -78 +77 @@
         uarg.uspace_thread_function = NULL;
         uarg.uspace_thread_arg = NULL;
-
+        
         free((uspace_arg_t *) arg);