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

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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) (3 diffs)

kernel/generic/src/main/kinit.c

@@ -107 +107 @@
         if (config.cpu_count > 1) {
                 waitq_initialize(&ap_completion_wq);
+                
                 /*
                  * Create the kmp thread and wait for its completion.
@@ -124 +125 @@
                 thread_join(thread);
                 thread_detach(thread);
-        }
-        
-        if (config.cpu_count > 1) {
+                
+                /*
+                 * For each CPU, create its load balancing thread.
+                 */
                 size_t i;
                 
-                /*
-                 * For each CPU, create its load balancing thread.
-                 */
                 for (i = 0; i < config.cpu_count; i++) {
                         thread = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true);
@@ -181 +180 @@
                 if (init.tasks[i].addr % FRAME_SIZE) {
                         printf("init[%" PRIs "].addr is not frame aligned\n", i);
+                        programs[i].task = NULL;
                         continue;
                 }