Changes in kernel/generic/src/main/kinit.c [7e752b2:98000fb] in mainline

File:

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

kernel/generic/src/main/kinit.c

@@ -66 +66 @@
 #include <ipc/ipc.h>
 #include <debug.h>
-#include <str.h>
-#include <sysinfo/stats.h>
+#include <string.h>
 
 #ifdef CONFIG_SMP
@@ -95 +94 @@
 void kinit(void *arg)
 {
+
+#if defined(CONFIG_SMP) || defined(CONFIG_KCONSOLE)
         thread_t *thread;
+#endif
         
         /*
@@ -107 +109 @@
         if (config.cpu_count > 1) {
                 waitq_initialize(&ap_completion_wq);
-                
                 /*
                  * Create the kmp thread and wait for its completion.
@@ -116 +117 @@
                 thread = thread_create(kmp, NULL, TASK, THREAD_FLAG_WIRED, "kmp", true);
                 if (thread != NULL) {
-                        irq_spinlock_lock(&thread->lock, false);
+                        spinlock_lock(&thread->lock);
                         thread->cpu = &cpus[0];
-                        irq_spinlock_unlock(&thread->lock, false);
+                        spinlock_unlock(&thread->lock);
                         thread_ready(thread);
                 } else
                         panic("Unable to create kmp thread.");
-                
                 thread_join(thread);
                 thread_detach(thread);
+        }
+        
+        if (config.cpu_count > 1) {
+                size_t i;
                 
                 /*
                  * For each CPU, create its load balancing thread.
                  */
-                unsigned int i;
-                
                 for (i = 0; i < config.cpu_count; i++) {
                         thread = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true);
                         if (thread != NULL) {
-                                irq_spinlock_lock(&thread->lock, false);
+                                spinlock_lock(&thread->lock);
                                 thread->cpu = &cpus[i];
-                                irq_spinlock_unlock(&thread->lock, false);
+                                spinlock_unlock(&thread->lock);
                                 thread_ready(thread);
                         } else
-                                printf("Unable to create kcpulb thread for cpu%u\n", i);
+                                printf("Unable to create kcpulb thread for cpu" PRIs "\n", i);
                 }
         }
@@ -148 +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
@@ -179 +174 @@
         for (i = 0; i < init.cnt; i++) {
                 if (init.tasks[i].addr % FRAME_SIZE) {
-                        printf("init[%zu].addr is not frame aligned\n", i);
-                        programs[i].task = NULL;
+                        printf("init[%" PRIs "].addr is not frame aligned\n", i);
                         continue;
                 }
@@ -190 +184 @@
                 
                 char namebuf[TASK_NAME_BUFLEN];
-                
-                const char *name = init.tasks[i].name;
+                char *name;
+                
+                name = init.tasks[i].name;
                 if (name[0] == 0)
                         name = "<unknown>";
@@ -199 +194 @@
                 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 +203 @@
                          */
                         cap_set(programs[i].task, CAP_CAP | CAP_MEM_MANAGER |
-                            CAP_IO_MANAGER | CAP_IRQ_REG);
+                            CAP_IO_MANAGER | CAP_PREEMPT_CONTROL | CAP_IRQ_REG);
                         
                         if (!ipc_phone_0)
@@ -219 +214 @@
                         
                         if (rd != RE_OK)
-                                printf("Init binary %zu not used (error %d)\n", i, rd);
+                                printf("Init binary %" PRIs " not used (error %d)\n", i, rd);
                 }
         }