Changeset 89c57b6 in mainline for kernel/generic/src/main/main.c

Timestamp:

2011-04-13T14:45:41Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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 mainline changes.

File:

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

kernel/generic/src/main/main.c

@@ -58 +58 @@
 #include <proc/thread.h>
 #include <proc/task.h>
-#include <proc/tasklet.h>
 #include <main/kinit.h>
 #include <main/version.h>
@@ -97 +96 @@
 /** Boot allocations. */
 ballocs_t ballocs = {
-        .base = NULL,
+        .base = (uintptr_t) NULL,
         .size = 0
 };
@@ -131 +130 @@
  *
  */
-void __attribute__((no_instrument_function)) main_bsp(void)
+NO_TRACE void main_bsp(void)
 {
         config.cpu_count = 1;
@@ -147 +146 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                if (PA_overlaps(config.stack_base, config.stack_size,
+                if (PA_OVERLAPS(config.stack_base, config.stack_size,
                     init.tasks[i].addr, init.tasks[i].size))
                         config.stack_base = ALIGN_UP(init.tasks[i].addr +
@@ -155 +154 @@
         /* Avoid placing stack on top of boot allocations. */
         if (ballocs.size) {
-                if (PA_overlaps(config.stack_base, config.stack_size,
+                if (PA_OVERLAPS(config.stack_base, config.stack_size,
                     ballocs.base, ballocs.size))
                         config.stack_base = ALIGN_UP(ballocs.base +
@@ -183 +182 @@
         version_print();
         
-        LOG("\nconfig.base=%p config.kernel_size=%" PRIs
-            "\nconfig.stack_base=%p config.stack_size=%" PRIs,
-            config.base, config.kernel_size, config.stack_base,
-            config.stack_size);
+        LOG("\nconfig.base=%p config.kernel_size=%zu"
+            "\nconfig.stack_base=%p config.stack_size=%zu",
+            (void *) config.base, config.kernel_size,
+            (void *) config.stack_base, config.stack_size);
         
 #ifdef CONFIG_KCONSOLE
@@ -217 +216 @@
         tlb_init();
         ddi_init();
-        tasklet_init();
         arch_post_mm_init();
         arch_pre_smp_init();
@@ -225 +223 @@
         slab_enable_cpucache();
         
-        printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
+        printf("Detected %u CPU(s), %" PRIu64 " MiB free memory\n",
             config.cpu_count, SIZE2MB(zones_total_size()));
         
@@ -241 +239 @@
                 size_t i;
                 for (i = 0; i < init.cnt; i++)
-                        LOG("init[%" PRIs "].addr=%p, init[%" PRIs
-                            "].size=%" PRIs, i, init.tasks[i].addr, i,
-                            init.tasks[i].size);
+                        LOG("init[%zu].addr=%p, init[%zu].size=%zu",
+                            i, (void *) init.tasks[i].addr, i, init.tasks[i].size);
         } else
                 printf("No init binaries found.\n");