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

Timestamp:

2010-05-21T07:50:04Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

• kernel/generic/src/main/kinit.c (modified) (7 diffs)

kernel/generic/src/main/kinit.c

@@ -66 +66 @@
 #include <ipc/ipc.h>
 #include <debug.h>
-#include <string.h>
+#include <str.h>
+#include <sysinfo/stats.h>
 
 #ifdef CONFIG_SMP
@@ -94 +95 @@
 void kinit(void *arg)
 {
-
-#if defined(CONFIG_SMP) || defined(CONFIG_KCONSOLE)
         thread_t *thread;
-#endif
         
         /*
@@ -123 +121 @@
                 } else
                         panic("Unable to create kmp thread.");
+                
                 thread_join(thread);
                 thread_detach(thread);
@@ -151 +150 @@
         arch_post_smp_init();
         
+        /* Start thread computing system load */
+        thread = thread_create(kload, NULL, TASK, 0, "kload", false);
+        if (thread != NULL)
+                thread_ready(thread);
+        else
+                printf("Unable to create kload thread\n");
+        
 #ifdef CONFIG_KCONSOLE
         if (stdin) {
@@ -184 +190 @@
                 
                 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 +222 @@
                 }
         }
-        
+
         /*
          * Run user tasks.
@@ -225 +230 @@
                         program_ready(&programs[i]);
         }
-        
+
 #ifdef CONFIG_KCONSOLE
         if (!stdin) {