Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I accidentally committed r42122 and r42123 to the signals branch. Merged into

Browse Source 
trunk. The interesting part of r42122 was already fixed in the trunk, though.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42124 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2011-06-12 14:53:02 +00:00
parent 2a55b919c3
commit b23ab34f66
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/boot/loader/pager.cpp
View File

@ -148,7 +148,7 @@ pager(const PagerTextSource& textSource)
// print the statistics line at the bottom
console_set_cursor(0, height - 1);
console_set_color(BLACK, WHITE);
console_set_color(BLACK, GRAY);
int32 bottomLine = std::min(topLine + height - 2, lineCount - 1);
printf("%" B_PRIuSIZE " - %" B_PRIuSIZE " %" B_PRIuSIZE "%%",
topLine, bottomLine, (bottomLine + 1) * 100 / lineCount);

13
src/system/boot/platform/bios_ia32/mmu.cpp
View File

@ -578,17 +578,24 @@ mmu_init_for_kernel(void)
dprintf("phys memory ranges:\n");
for (i = 0; i < gKernelArgs.num_physical_memory_ranges; i++) {
dprintf(" base 0x%08lx, length 0x%08lx\n", gKernelArgs.physical_memory_range[i].start, gKernelArgs.physical_memory_range[i].size);
dprintf(" base %#018" B_PRIxPHYSADDR ", length %#018"
B_PRIxPHYSADDR "\n", gKernelArgs.physical_memory_range[i].start,
gKernelArgs.physical_memory_range[i].size);
}
dprintf("allocated phys memory ranges:\n");
for (i = 0; i < gKernelArgs.num_physical_allocated_ranges; i++) {
dprintf(" base 0x%08lx, length 0x%08lx\n", gKernelArgs.physical_allocated_range[i].start, gKernelArgs.physical_allocated_range[i].size);
dprintf(" base %#018" B_PRIxPHYSADDR ", length %#018"
B_PRIxPHYSADDR "\n",
gKernelArgs.physical_allocated_range[i].start,
gKernelArgs.physical_allocated_range[i].size);
}
dprintf("allocated virt memory ranges:\n");
for (i = 0; i < gKernelArgs.num_virtual_allocated_ranges; i++) {
dprintf(" base 0x%08lx, length 0x%08lx\n", gKernelArgs.virtual_allocated_range[i].start, gKernelArgs.virtual_allocated_range[i].size);
dprintf(" base %#018" B_PRIxADDR ", length %#018" B_PRIxSIZE
"\n", gKernelArgs.virtual_allocated_range[i].start,
gKernelArgs.virtual_allocated_range[i].size);
}
}
#endif