Changes in kernel/generic/src/main/main.c [8a64e81e:91db0280] in mainline

File:

• kernel/generic/src/main/main.c (modified) (6 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>
@@ -90 +89 @@
 #include <sysinfo/stats.h>
 #include <lib/ra.h>
+
+/* Ensure [u]int*_t types are of correct size.
+ *
+ * Probably, this is not the best place for such tests
+ * but this file is compiled on all architectures.
+ */
+#define CHECK_INT_TYPE_(signness, size) \
+        STATIC_ASSERT_VERBOSE(sizeof(signness##size##_t) * 8 == size, \
+            #signness #size "_t does not have " #size " bits");
+
+#define CHECK_INT_TYPE(size) \
+        CHECK_INT_TYPE_(int, size); \
+        CHECK_INT_TYPE_(uint, size)
+
+CHECK_INT_TYPE(8);
+CHECK_INT_TYPE(16);
+CHECK_INT_TYPE(32);
+CHECK_INT_TYPE(64);
 
 /** Global configuration structure. */
@@ -246 +263 @@
         
         cpu_init();
+        
         calibrate_delay_loop();
-        arch_post_cpu_init();
-
-        smp_call_init();
-        workq_global_init();
         clock_counter_init();
         timeout_init();
@@ -268 +282 @@
         ipc_init();
         event_init();
-        klog_init();
+        kio_init();
+        log_init();
         stats_init();
         
@@ -352 +367 @@
 void main_ap_separated_stack(void)
 {
-        smp_call_init();
-        
         /*
          * Configure timeouts for this cpu.