|
@@ -362,42 +362,38 @@ void __init mem_init(void)
|
|
|
#define MLG(b, t) b, t, ((t) - (b)) >> 30
|
|
|
#define MLK_ROUNDUP(b, t) b, t, DIV_ROUND_UP(((t) - (b)), SZ_1K)
|
|
|
|
|
|
- pr_notice("Virtual kernel memory layout:\n"
|
|
|
+ pr_notice("Virtual kernel memory layout:\n");
|
|
|
#ifdef CONFIG_KASAN
|
|
|
- " kasan : 0x%16lx - 0x%16lx (%6ld GB)\n"
|
|
|
+ pr_cont(" kasan : 0x%16lx - 0x%16lx (%6ld GB)\n",
|
|
|
+ MLG(KASAN_SHADOW_START, KASAN_SHADOW_END));
|
|
|
#endif
|
|
|
- " modules : 0x%16lx - 0x%16lx (%6ld MB)\n"
|
|
|
- " vmalloc : 0x%16lx - 0x%16lx (%6ld GB)\n"
|
|
|
- " .text : 0x%p" " - 0x%p" " (%6ld KB)\n"
|
|
|
- " .rodata : 0x%p" " - 0x%p" " (%6ld KB)\n"
|
|
|
- " .init : 0x%p" " - 0x%p" " (%6ld KB)\n"
|
|
|
- " .data : 0x%p" " - 0x%p" " (%6ld KB)\n"
|
|
|
+ pr_cont(" modules : 0x%16lx - 0x%16lx (%6ld MB)\n",
|
|
|
+ MLM(MODULES_VADDR, MODULES_END));
|
|
|
+ pr_cont(" vmalloc : 0x%16lx - 0x%16lx (%6ld GB)\n",
|
|
|
+ MLG(VMALLOC_START, VMALLOC_END));
|
|
|
+ pr_cont(" .text : 0x%p" " - 0x%p" " (%6ld KB)\n"
|
|
|
+ " .rodata : 0x%p" " - 0x%p" " (%6ld KB)\n"
|
|
|
+ " .init : 0x%p" " - 0x%p" " (%6ld KB)\n"
|
|
|
+ " .data : 0x%p" " - 0x%p" " (%6ld KB)\n",
|
|
|
+ MLK_ROUNDUP(_text, __start_rodata),
|
|
|
+ MLK_ROUNDUP(__start_rodata, _etext),
|
|
|
+ MLK_ROUNDUP(__init_begin, __init_end),
|
|
|
+ MLK_ROUNDUP(_sdata, _edata));
|
|
|
#ifdef CONFIG_SPARSEMEM_VMEMMAP
|
|
|
- " vmemmap : 0x%16lx - 0x%16lx (%6ld GB maximum)\n"
|
|
|
- " 0x%16lx - 0x%16lx (%6ld MB actual)\n"
|
|
|
+ pr_cont(" vmemmap : 0x%16lx - 0x%16lx (%6ld GB maximum)\n"
|
|
|
+ " 0x%16lx - 0x%16lx (%6ld MB actual)\n",
|
|
|
+ MLG((unsigned long)vmemmap,
|
|
|
+ (unsigned long)vmemmap + VMEMMAP_SIZE),
|
|
|
+ MLM((unsigned long)phys_to_page(memblock_start_of_DRAM()),
|
|
|
+ (unsigned long)virt_to_page(high_memory)));
|
|
|
#endif
|
|
|
- " fixed : 0x%16lx - 0x%16lx (%6ld KB)\n"
|
|
|
- " PCI I/O : 0x%16lx - 0x%16lx (%6ld MB)\n"
|
|
|
- " memory : 0x%16lx - 0x%16lx (%6ld MB)\n",
|
|
|
-#ifdef CONFIG_KASAN
|
|
|
- MLG(KASAN_SHADOW_START, KASAN_SHADOW_END),
|
|
|
-#endif
|
|
|
- MLM(MODULES_VADDR, MODULES_END),
|
|
|
- MLG(VMALLOC_START, VMALLOC_END),
|
|
|
- MLK_ROUNDUP(_text, __start_rodata),
|
|
|
- MLK_ROUNDUP(__start_rodata, _etext),
|
|
|
- MLK_ROUNDUP(__init_begin, __init_end),
|
|
|
- MLK_ROUNDUP(_sdata, _edata),
|
|
|
-#ifdef CONFIG_SPARSEMEM_VMEMMAP
|
|
|
- MLG((unsigned long)vmemmap,
|
|
|
- (unsigned long)vmemmap + VMEMMAP_SIZE),
|
|
|
- MLM((unsigned long)phys_to_page(memblock_start_of_DRAM()),
|
|
|
- (unsigned long)virt_to_page(high_memory)),
|
|
|
-#endif
|
|
|
- MLK(FIXADDR_START, FIXADDR_TOP),
|
|
|
- MLM(PCI_IO_START, PCI_IO_END),
|
|
|
- MLM(__phys_to_virt(memblock_start_of_DRAM()),
|
|
|
- (unsigned long)high_memory));
|
|
|
+ pr_cont(" fixed : 0x%16lx - 0x%16lx (%6ld KB)\n",
|
|
|
+ MLK(FIXADDR_START, FIXADDR_TOP));
|
|
|
+ pr_cont(" PCI I/O : 0x%16lx - 0x%16lx (%6ld MB)\n",
|
|
|
+ MLM(PCI_IO_START, PCI_IO_END));
|
|
|
+ pr_cont(" memory : 0x%16lx - 0x%16lx (%6ld MB)\n",
|
|
|
+ MLM(__phys_to_virt(memblock_start_of_DRAM()),
|
|
|
+ (unsigned long)high_memory));
|
|
|
|
|
|
#undef MLK
|
|
|
#undef MLM
|