Changeset eb522e8 in mainline for kernel/generic/src/main/main.c
- Timestamp:
- 2011-06-01T08:43:42Z (14 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified kernel/generic/src/main/main.c ¶
r9e2e715 reb522e8 58 58 #include <proc/thread.h> 59 59 #include <proc/task.h> 60 #include <proc/tasklet.h>61 60 #include <main/kinit.h> 62 61 #include <main/version.h> … … 72 71 #include <mm/as.h> 73 72 #include <mm/slab.h> 73 #include <mm/reserve.h> 74 74 #include <synch/waitq.h> 75 75 #include <synch/futex.h> … … 97 97 /** Boot allocations. */ 98 98 ballocs_t ballocs = { 99 .base = NULL,99 .base = (uintptr_t) NULL, 100 100 .size = 0 101 101 }; … … 183 183 version_print(); 184 184 185 LOG("\nconfig.base=%p config.kernel_size=% " PRIs186 "\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); 189 189 190 190 #ifdef CONFIG_KCONSOLE … … 217 217 tlb_init(); 218 218 ddi_init(); 219 tasklet_init();220 219 arch_post_mm_init(); 220 reserve_init(); 221 221 arch_pre_smp_init(); 222 222 smp_init(); … … 225 225 slab_enable_cpucache(); 226 226 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); 229 232 230 233 cpu_init(); … … 241 244 size_t i; 242 245 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); 246 248 } else 247 249 printf("No init binaries found.\n");
Note:
See TracChangeset
for help on using the changeset viewer.