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


Ignore:
Timestamp:
2011-06-01T08:43:42Z (14 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8d6c1f1
Parents:
9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually :)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified kernel/generic/src/main/main.c

    r9e2e715 reb522e8  
    5858#include <proc/thread.h>
    5959#include <proc/task.h>
    60 #include <proc/tasklet.h>
    6160#include <main/kinit.h>
    6261#include <main/version.h>
     
    7271#include <mm/as.h>
    7372#include <mm/slab.h>
     73#include <mm/reserve.h>
    7474#include <synch/waitq.h>
    7575#include <synch/futex.h>
     
    9797/** Boot allocations. */
    9898ballocs_t ballocs = {
    99         .base = NULL,
     99        .base = (uintptr_t) NULL,
    100100        .size = 0
    101101};
     
    183183        version_print();
    184184       
    185         LOG("\nconfig.base=%p config.kernel_size=%" PRIs
    186             "\nconfig.stack_base=%p config.stack_size=%" PRIs,
    187             config.base, config.kernel_size, config.stack_base,
    188             config.stack_size);
     185        LOG("\nconfig.base=%p config.kernel_size=%zu"
     186            "\nconfig.stack_base=%p config.stack_size=%zu",
     187            (void *) config.base, config.kernel_size,
     188            (void *) config.stack_base, config.stack_size);
    189189       
    190190#ifdef CONFIG_KCONSOLE
     
    217217        tlb_init();
    218218        ddi_init();
    219         tasklet_init();
    220219        arch_post_mm_init();
     220        reserve_init();
    221221        arch_pre_smp_init();
    222222        smp_init();
     
    225225        slab_enable_cpucache();
    226226       
    227         printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
    228             config.cpu_count, SIZE2MB(zones_total_size()));
     227        uint64_t size;
     228        const char *size_suffix;
     229        bin_order_suffix(zones_total_size(), &size, &size_suffix, false);
     230        printf("Detected %u CPU(s), %" PRIu64 " %s free memory\n",
     231            config.cpu_count, size, size_suffix);
    229232       
    230233        cpu_init();
     
    241244                size_t i;
    242245                for (i = 0; i < init.cnt; i++)
    243                         LOG("init[%" PRIs "].addr=%p, init[%" PRIs
    244                             "].size=%" PRIs, i, init.tasks[i].addr, i,
    245                             init.tasks[i].size);
     246                        LOG("init[%zu].addr=%p, init[%zu].size=%zu",
     247                            i, (void *) init.tasks[i].addr, i, init.tasks[i].size);
    246248        } else
    247249                printf("No init binaries found.\n");
Note: See TracChangeset for help on using the changeset viewer.