Fixed boot messages

This commit is contained in:
Bahadir Balban
2009-08-11 15:28:39 +03:00
parent f82db61519
commit c7404c7322
3 changed files with 19 additions and 10 deletions

View File

@@ -285,7 +285,8 @@ int init_first_pager(struct pager *pager,
page_align_up(pager->memsize),
MAP_USR_DEFAULT_FLAGS, TASK_PGD(task));
printk("Mapping %lu pages from 0x%lx to 0x%lx for %s\n",
printk("%s: Mapping %lu pages from 0x%lx to 0x%lx for %s\n",
__KERNELNAME__,
__pfn(page_align_up(pager->memsize)),
pager->start_lma, pager->start_vma, cont->name);
@@ -331,8 +332,8 @@ int init_pager(struct pager *pager, struct container *cont)
page_align_up(pager->memsize),
MAP_USR_DEFAULT_FLAGS, TASK_PGD(task));
printk("Mapping %lu pages from 0x%lx to 0x%lx for %s\n",
__pfn(page_align_up(pager->memsize)),
printk("%s: Mapping %lu pages from 0x%lx to 0x%lx for %s\n",
__KERNELNAME__, __pfn(page_align_up(pager->memsize)),
pager->start_lma, pager->start_vma, cont->name);
/* Initialize task scheduler parameters */

View File

@@ -241,6 +241,10 @@ int free_boot_memory(struct kernel_container *kcont)
for (unsigned long i = pfn_start; i < pfn_end; i++)
remove_mapping(phys_to_virt(__pfn_to_addr(i)));
printk("%s: Freed %lu KB init memory.\n",
__KERNELNAME__,
__pfn_to_addr((pfn_end - pfn_start)) / 1024);
return 0;
}
@@ -596,12 +600,14 @@ int process_cap_info(struct cap_info *cap,
if ((ret = memcap_unmap(&kcont->virtmem_free,
cap->start, cap->end))) {
if (ret < 0)
printk("FATAL: Insufficient boot memory "
"to split capability\n");
printk("%s: FATAL: Insufficient boot memory "
"to split capability\n",
__KERNELNAME__);
if (ret > 0)
printk("FATAL: Memory capability range "
printk("%s: FATAL: Memory capability range "
"overlaps with another one. "
"start=0x%lx, end=0x%lx\n",
__KERNELNAME__,
__pfn_to_addr(cap->start),
__pfn_to_addr(cap->end));
BUG();
@@ -611,12 +617,14 @@ int process_cap_info(struct cap_info *cap,
if ((ret = memcap_unmap(&kcont->physmem_free,
cap->start, cap->end))) {
if (ret < 0)
printk("FATAL: Insufficient boot memory "
"to split capability\n");
printk("%s: FATAL: Insufficient boot memory "
"to split capability\n",
__KERNELNAME__);
if (ret > 0)
printk("FATAL: Memory capability range "
printk("%s: FATAL: Memory capability range "
"overlaps with another one. "
"start=0x%lx, end=0x%lx\n",
__KERNELNAME__,
__pfn_to_addr(cap->start),
__pfn_to_addr(cap->end));
BUG();

View File

@@ -416,7 +416,7 @@ void start_kernel(void)
printascii("\n"__KERNELNAME__": start kernel...\n");
/* Print section boundaries for kernel image */
print_sections();
// print_sections();
/* Initialise section mappings for the kernel area */
init_kernel_mappings();