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

Timestamp:

2024-02-23T17:57:23Z (3 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (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.

git-author:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

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>
@@ -174 +173 @@
             ALIGN_UP((uintptr_t) kdata_end - config.base, PAGE_SIZE);
 
-        context_save(&ctx);
-        context_set(&ctx, FADDR(main_bsp_separated_stack),
+        context_create(&ctx, main_bsp_separated_stack,
             bootstrap_stack, bootstrap_stack_size);
         context_restore(&ctx);
@@ -282 +280 @@
         if (!kinit_thread)
                 panic("Cannot create kinit thread.");
-        thread_ready(kinit_thread);
-
-        /*
-         * This call to scheduler() will return to kinit,
+        thread_start(kinit_thread);
+        thread_detach(kinit_thread);
+
+        /*
+         * This call to scheduler_run() will return to kinit,
          * starting the thread of kernel threads.
          */
-        scheduler();
+        current_copy(CURRENT, (current_t *) CPU_LOCAL->stack);
+        context_replace(scheduler_run, CPU_LOCAL->stack, STACK_SIZE);
         /* 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
@@ -335 +333 @@
          * switch to this cpu's private stack prior to waking kmp up.
          */
-        context_t ctx;
-        context_save(&ctx);
-        context_set(&ctx, FADDR(main_ap_separated_stack),
-            (uintptr_t) CPU->stack, STACK_SIZE);
-        context_restore(&ctx);
+        current_copy(CURRENT, (current_t *) CPU_LOCAL->stack);
+        context_replace(main_ap_separated_stack, CPU_LOCAL->stack, STACK_SIZE);
         /* not reached */
 }
@@ -356 +351 @@
 
         semaphore_up(&ap_completion_semaphore);
-        scheduler();
+        scheduler_run();
         /* not reached */
 }