arm64: mm: make pr_cont() per line in Virtual kernel memory layout

Each line with single pr_cont() in Virtual kernel memory layout,
or the dump of the kernel memory layout in dmesg is not aligned
when PRINTK_TIME enabled, due to the missing time stamps.

Tested-by: James Morse <james.morse@arm.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Kefeng Wang 2016-04-18 11:09:46 +08:00 committed by Will Deacon
parent 7464b6e3a5
commit d32351c824

View File

@ -429,23 +429,22 @@ void __init mem_init(void)
MLM(MODULES_VADDR, MODULES_END)); MLM(MODULES_VADDR, MODULES_END));
pr_cont(" vmalloc : 0x%16lx - 0x%16lx (%6ld GB)\n", pr_cont(" vmalloc : 0x%16lx - 0x%16lx (%6ld GB)\n",
MLG(VMALLOC_START, VMALLOC_END)); MLG(VMALLOC_START, VMALLOC_END));
pr_cont(" .text : 0x%p" " - 0x%p" " (%6ld KB)\n" pr_cont(" .text : 0x%p" " - 0x%p" " (%6ld KB)\n",
" .rodata : 0x%p" " - 0x%p" " (%6ld KB)\n" MLK_ROUNDUP(_text, __start_rodata));
" .init : 0x%p" " - 0x%p" " (%6ld KB)\n" pr_cont(" .rodata : 0x%p" " - 0x%p" " (%6ld KB)\n",
" .data : 0x%p" " - 0x%p" " (%6ld KB)\n", MLK_ROUNDUP(__start_rodata, _etext));
MLK_ROUNDUP(_text, __start_rodata), pr_cont(" .init : 0x%p" " - 0x%p" " (%6ld KB)\n",
MLK_ROUNDUP(__start_rodata, _etext), MLK_ROUNDUP(__init_begin, __init_end));
MLK_ROUNDUP(__init_begin, __init_end), pr_cont(" .data : 0x%p" " - 0x%p" " (%6ld KB)\n",
MLK_ROUNDUP(_sdata, _edata)); MLK_ROUNDUP(_sdata, _edata));
pr_cont(" fixed : 0x%16lx - 0x%16lx (%6ld KB)\n", pr_cont(" fixed : 0x%16lx - 0x%16lx (%6ld KB)\n",
MLK(FIXADDR_START, FIXADDR_TOP)); MLK(FIXADDR_START, FIXADDR_TOP));
pr_cont(" PCI I/O : 0x%16lx - 0x%16lx (%6ld MB)\n", pr_cont(" PCI I/O : 0x%16lx - 0x%16lx (%6ld MB)\n",
MLM(PCI_IO_START, PCI_IO_END)); MLM(PCI_IO_START, PCI_IO_END));
#ifdef CONFIG_SPARSEMEM_VMEMMAP #ifdef CONFIG_SPARSEMEM_VMEMMAP
pr_cont(" vmemmap : 0x%16lx - 0x%16lx (%6ld GB maximum)\n" pr_cont(" vmemmap : 0x%16lx - 0x%16lx (%6ld GB maximum)\n",
" 0x%16lx - 0x%16lx (%6ld MB actual)\n", MLG(VMEMMAP_START, VMEMMAP_START + VMEMMAP_SIZE));
MLG(VMEMMAP_START, pr_cont(" 0x%16lx - 0x%16lx (%6ld MB actual)\n",
VMEMMAP_START + VMEMMAP_SIZE),
MLM((unsigned long)phys_to_page(memblock_start_of_DRAM()), MLM((unsigned long)phys_to_page(memblock_start_of_DRAM()),
(unsigned long)virt_to_page(high_memory))); (unsigned long)virt_to_page(high_memory)));
#endif #endif