Changes in kernel/generic/src/main/main.c [9e40355e:3b3faf51] in mainline

File:

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

kernel/generic/src/main/main.c

@@ -62 +62 @@
 #include <console/kconsole.h>
 #include <console/console.h>
+#include <log.h>
 #include <cpu.h>
 #include <align.h>
@@ -75 +76 @@
 #include <synch/waitq.h>
 #include <synch/futex.h>
+#include <synch/workqueue.h>
+#include <smp/smp_call.h>
 #include <arch/arch.h>
 #include <arch.h>
@@ -113 +116 @@
         .physmem_end = 0
 };
+
+/** Boot arguments. */
+char bargs[CONFIG_BOOT_ARGUMENTS_BUFLEN] = {};
 
 /** Initial user-space tasks */
@@ -235 +241 @@
          * Memory management subsystems initialization.
          */
-        arch_pre_mm_init();
+        ARCH_OP(pre_mm_init);
         km_identity_init();
         frame_init();
@@ -247 +253 @@
         km_non_identity_init();
         ddi_init();
-        arch_post_mm_init();
+        ARCH_OP(post_mm_init);
         reserve_init();
-        arch_pre_smp_init();
+        ARCH_OP(pre_smp_init);
         smp_init();
         
@@ -262 +268 @@
         
         cpu_init();
-        
         calibrate_delay_loop();
+        ARCH_OP(post_cpu_init);
+
+        smp_call_init();
+        workq_global_init();
         clock_counter_init();
         timeout_init();
@@ -270 +279 @@
         thread_init();
         futex_init();
-        
+
+        sysinfo_set_item_data("boot_args", NULL, bargs, str_size(bargs) + 1);
+
         if (init.cnt > 0) {
                 size_t i;
@@ -281 +292 @@
         ipc_init();
         event_init();
-        klog_init();
+        kio_init();
+        log_init();
         stats_init();
         
@@ -334 +346 @@
         the_initialize(THE);
         
-        arch_pre_mm_init();
+        ARCH_OP(pre_mm_init);
         frame_init();
         page_init();
         tlb_init();
-        arch_post_mm_init();
+        ARCH_OP(post_mm_init);
         
         cpu_init();
         calibrate_delay_loop();
-        arch_post_cpu_init();
+        ARCH_OP(post_cpu_init);
         
         the_copy(THE, (the_t *) CPU->stack);
@@ -365 +377 @@
 void main_ap_separated_stack(void)
 {
+        smp_call_init();
+        
         /*
          * Configure timeouts for this cpu.