Changeset 88dea9d in mainline for kernel/generic/src/main

Timestamp:

2010-04-17T16:28:49Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

30a5470

Parents:

5ba201d (diff), 95319bd (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 from measuring branch

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (2 diffs)
• main.c (modified) (1 diff)

kernel/generic/src/main/kinit.c

@@ -67 +67 @@
 #include <debug.h>
 #include <str.h>
+#include <ps/load.h>
 
 #ifdef CONFIG_SMP
@@ -163 +164 @@
 #endif /* CONFIG_KCONSOLE */
         
+        /* Start thread computing system load */
+        thread = thread_create(kload_thread, NULL, TASK, 0, "kload", false);
+        if (thread != NULL)
+                thread_ready(thread);
+        else
+                printf("Unable to create kload thread\n");
+
         interrupts_enable();
         

kernel/generic/src/main/main.c

@@ -226 +226 @@
         printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
             config.cpu_count, SIZE2MB(zone_total_size()));
-        
+
         LOG_EXEC(cpu_init());