Changes in kernel/generic/src/main/main.c [97186929:26aafe8] in mainline

File:

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

kernel/generic/src/main/main.c

@@ -71 +71 @@
 #include <mm/as.h>
 #include <mm/slab.h>
+#include <mm/reserve.h>
 #include <synch/waitq.h>
 #include <synch/futex.h>
@@ -117 +118 @@
 #endif
 
-#define CONFIG_STACK_SIZE  ((1 << STACK_FRAMES) * STACK_SIZE)
-
 /** Main kernel routine for bootstrap CPU.
  *
@@ -138 +137 @@
         config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
             hardcoded_kdata_size, PAGE_SIZE);
-        config.stack_size = CONFIG_STACK_SIZE;
+        config.stack_size = STACK_SIZE;
         
         /* Initialy the stack is placed just after the kernel */
@@ -164 +163 @@
         
         context_save(&ctx);
-        context_set(&ctx, FADDR(main_bsp_separated_stack), config.stack_base,
-            THREAD_STACK_SIZE);
+        context_set(&ctx, FADDR(main_bsp_separated_stack),
+            config.stack_base, STACK_SIZE);
         context_restore(&ctx);
         /* not reached */
@@ -217 +216 @@
         ddi_init();
         arch_post_mm_init();
+        reserve_init();
         arch_pre_smp_init();
         smp_init();
@@ -223 +223 @@
         slab_enable_cpucache();
         
-        printf("Detected %u CPU(s), %" PRIu64 " MiB free memory\n",
-            config.cpu_count, SIZE2MB(zones_total_size()));
+        uint64_t size;
+        const char *size_suffix;
+        bin_order_suffix(zones_total_size(), &size, &size_suffix, false);
+        printf("Detected %u CPU(s), %" PRIu64 " %s free memory\n",
+            config.cpu_count, size, size_suffix);
         
         cpu_init();
@@ -318 +321 @@
         context_save(&CPU->saved_context);
         context_set(&CPU->saved_context, FADDR(main_ap_separated_stack),
-            (uintptr_t) CPU->stack, CPU_STACK_SIZE);
+            (uintptr_t) CPU->stack, STACK_SIZE);
         context_restore(&CPU->saved_context);
         /* not reached */