Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 84439d7 in mainline for kernel/generic/src/main/main.c


Ignore:
Timestamp:
2010-12-05T09:34:46Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
75732da
Parents:
56b962d (diff), 35537a7 (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 with development/

File:
1 edited

Legend:

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

    r56b962d r84439d7  
    183183        version_print();
    184184       
    185         LOG("\nconfig.base=%p config.kernel_size=%" PRIs
    186             "\nconfig.stack_base=%p config.stack_size=%" PRIs,
     185        LOG("\nconfig.base=%p config.kernel_size=%zu"
     186            "\nconfig.stack_base=%p config.stack_size=%zu",
    187187            config.base, config.kernel_size, config.stack_base,
    188188            config.stack_size);
     
    225225        slab_enable_cpucache();
    226226       
    227         printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
     227        printf("Detected %u CPU(s), %" PRIu64 " MiB free memory\n",
    228228            config.cpu_count, SIZE2MB(zones_total_size()));
    229229       
     
    241241                size_t i;
    242242                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);
     243                        LOG("init[%zu].addr=%p, init[%zu].size=%zu",
     244                            i, init.tasks[i].addr, i, init.tasks[i].size);
    246245        } else
    247246                printf("No init binaries found.\n");
Note: See TracChangeset for help on using the changeset viewer.