Changes in kernel/generic/src/main/main.c [25939997:d28bdbe] in mainline

File:

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

kernel/generic/src/main/main.c

@@ -80 +80 @@
 #include <arch/arch.h>
 #include <arch.h>
+#include <arch/faddr.h>
 #include <ipc/ipc.h>
 #include <macros.h>
@@ -173 +174 @@
             ALIGN_UP((uintptr_t) kdata_end - config.base, PAGE_SIZE);
 
-        context_create(&ctx, main_bsp_separated_stack,
+        context_save(&ctx);
+        context_set(&ctx, FADDR(main_bsp_separated_stack),
             bootstrap_stack, bootstrap_stack_size);
         context_restore(&ctx);
@@ -280 +282 @@
         if (!kinit_thread)
                 panic("Cannot create kinit thread.");
-        thread_start(kinit_thread);
-        thread_detach(kinit_thread);
-
-        /*
-         * This call to scheduler_run() will return to kinit,
+        thread_ready(kinit_thread);
+
+        /*
+         * This call to scheduler() will return to kinit,
          * starting the thread of kernel threads.
          */
-        current_copy(CURRENT, (current_t *) CPU_LOCAL->stack);
-        context_replace(scheduler_run, CPU_LOCAL->stack, STACK_SIZE);
+        scheduler();
         /* not reached */
 }
@@ -328 +328 @@
         ARCH_OP(post_cpu_init);
 
+        current_copy(CURRENT, (current_t *) CPU->stack);
+
         /*
          * If we woke kmp up before we left the kernel stack, we could
@@ -333 +335 @@
          * switch to this cpu's private stack prior to waking kmp up.
          */
-        current_copy(CURRENT, (current_t *) CPU_LOCAL->stack);
-        context_replace(main_ap_separated_stack, CPU_LOCAL->stack, STACK_SIZE);
+        context_t ctx;
+        context_save(&ctx);
+        context_set(&ctx, FADDR(main_ap_separated_stack),
+            (uintptr_t) CPU->stack, STACK_SIZE);
+        context_restore(&ctx);
         /* not reached */
 }
@@ -351 +356 @@
 
         semaphore_up(&ap_completion_semaphore);
-        scheduler_run();
+        scheduler();
         /* not reached */
 }