Changes in kernel/generic/src/main/kinit.c [36df4109:a4e23f8c] in mainline

File:

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

kernel/generic/src/main/kinit.c

@@ -59 +59 @@
 #include <mm/km.h>
 #include <print.h>
-#include <log.h>
 #include <memstr.h>
 #include <console/console.h>
@@ -79 +78 @@
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
-#include <synch/workqueue.h>
-#include <synch/rcu.h>
 
 #define ALIVE_CHARS  4
@@ -107 +104 @@
          */
         thread_detach(THREAD);
-
+        
         interrupts_disable();
-        
-        /* Start processing RCU callbacks. RCU is fully functional afterwards. */
-        rcu_kinit_init();
-        
-        /*
-         * Start processing work queue items. Some may have been queued during boot.
-         */
-        workq_global_worker_init();
         
 #ifdef CONFIG_SMP
@@ -151 +140 @@
                                 thread_ready(thread);
                         } else
-                                log(LF_OTHER, LVL_ERROR,
-                                    "Unable to create kcpulb thread for cpu%u", i);
+                                printf("Unable to create kcpulb thread for cpu%u\n", i);
                 }
         }
@@ -160 +148 @@
          * At this point SMP, if present, is configured.
          */
-        ARCH_OP(post_smp_init);
+        arch_post_smp_init();
         
         /* Start thread computing system load */
@@ -168 +156 @@
                 thread_ready(thread);
         else
-                log(LF_OTHER, LVL_ERROR, "Unable to create kload thread");
+                printf("Unable to create kload thread\n");
         
 #ifdef CONFIG_KCONSOLE
@@ -180 +168 @@
                         thread_ready(thread);
                 else
-                        log(LF_OTHER, LVL_ERROR,
-                            "Unable to create kconsole thread");
+                        printf("Unable to create kconsole thread\n");
         }
 #endif /* CONFIG_KCONSOLE */
@@ -223 +210 @@
         for (i = 0; i < init.cnt; i++) {
                 if (init.tasks[i].paddr % FRAME_SIZE) {
-                        log(LF_OTHER, LVL_ERROR,
-                            "init[%zu]: Address is not frame aligned", i);
+                        printf("init[%zu]: Address is not frame aligned\n", i);
                         programs[i].task = NULL;
                         continue;
@@ -240 +226 @@
                         name = "<unknown>";
                 
-                STATIC_ASSERT(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN);
+                ASSERT(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN);
                 str_cpy(namebuf, TASK_NAME_BUFLEN, INIT_PREFIX);
                 str_cpy(namebuf + INIT_PREFIX_LEN,
@@ -287 +273 @@
                         init_rd((void *) init.tasks[i].paddr, init.tasks[i].size);
                 } else
-                        log(LF_OTHER, LVL_ERROR,
-                            "init[%zu]: Init binary load failed "
-                            "(error %d, loader status %u)", i, rc,
+                        printf("init[%zu]: Init binary load failed "
+                            "(error %d, loader status %u)\n", i, rc,
                             programs[i].loader_status);
         }