Changes in kernel/generic/src/main/kinit.c [52c60b6:2fa10f6] in mainline

File:

• kernel/generic/src/main/kinit.c (modified) (8 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.
@@ -115 +116 @@
                 thread = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED, "kmp", true);
                 if (thread != NULL) {
-                        spinlock_lock(&thread->lock);
+                        irq_spinlock_lock(&thread->lock, false);
                         thread->cpu = &cpus[0];
-                        spinlock_unlock(&thread->lock);
+                        irq_spinlock_unlock(&thread->lock, false);
                         thread_ready(thread);
                 } else
@@ -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);
                         if (thread != NULL) {
-                                spinlock_lock(&thread->lock);
+                                irq_spinlock_lock(&thread->lock, false);
                                 thread->cpu = &cpus[i];
-                                spinlock_unlock(&thread->lock);
+                                irq_spinlock_unlock(&thread->lock, false);
                                 thread_ready(thread);
                         } else
@@ -181 +180 @@
                 if (init.tasks[i].addr % FRAME_SIZE) {
                         printf("init[%" PRIs "].addr is not frame aligned\n", i);
+                        programs[i].task = NULL;
                         continue;
                 }
@@ -199 +199 @@
                 str_cpy(namebuf + INIT_PREFIX_LEN,
                     TASK_NAME_BUFLEN - INIT_PREFIX_LEN, name);
-
+                
                 int rc = program_create_from_image((void *) init.tasks[i].addr,
                     namebuf, &programs[i]);
@@ -208 +208 @@
                          */
                         cap_set(programs[i].task, CAP_CAP | CAP_MEM_MANAGER |
-                            CAP_IO_MANAGER | CAP_PREEMPT_CONTROL | CAP_IRQ_REG);
+                            CAP_IO_MANAGER | CAP_IRQ_REG);
                         
                         if (!ipc_phone_0)
@@ -222 +222 @@
                 }
         }
-
+        
         /*
          * Run user tasks.
@@ -230 +230 @@
                         program_ready(&programs[i]);
         }
-
+        
 #ifdef CONFIG_KCONSOLE
         if (!stdin) {