Changeset 371bd7d in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2010-03-27T09:22:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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/kinit.c (modified) (5 diffs)

kernel/generic/src/main/kinit.c

@@ -66 +66 @@
 #include <ipc/ipc.h>
 #include <debug.h>
-#include <string.h>
+#include <str.h>
 
 #ifdef CONFIG_SMP
@@ -94 +94 @@
 void kinit(void *arg)
 {
-
 #if defined(CONFIG_SMP) || defined(CONFIG_KCONSOLE)
         thread_t *thread;
@@ -184 +183 @@
                 
                 char namebuf[TASK_NAME_BUFLEN];
-                char *name;
-                
-                name = init.tasks[i].name;
+                
+                const char *name = init.tasks[i].name;
                 if (name[0] == 0)
                         name = "<unknown>";
@@ -217 +215 @@
                 }
         }
-        
+
         /*
          * Run user tasks.
@@ -225 +223 @@
                         program_ready(&programs[i]);
         }
-        
+
 #ifdef CONFIG_KCONSOLE
         if (!stdin) {