Changeset b1c57a8 in mainline for kernel/generic/src/main/main.c

Timestamp:

2014-10-09T15:03:55Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:

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

kernel/generic/src/main/main.c

@@ -76 +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>
@@ -263 +265 @@
         
         cpu_init();
-        
         calibrate_delay_loop();
+        arch_post_cpu_init();
+
+        smp_call_init();
+        workq_global_init();
         clock_counter_init();
         timeout_init();
@@ -367 +372 @@
 void main_ap_separated_stack(void)
 {
+        smp_call_init();
+        
         /*
          * Configure timeouts for this cpu.