Merge branch 'next/misc2' into for-next (8eace9fb) · Commits · 戴 / test

arch/riscv/mm/init.c

+32 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,37 @@ static void setup_zero_page(void)
		memset((void *)empty_zero_page, 0, PAGE_SIZE);
		}

		#ifdef CONFIG_DEBUG_VM
		static inline void print_mlk(char *name, unsigned long b, unsigned long t)
		{
		pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld kB)\n", name, b, t,
		(((t) - (b)) >> 10));
		}

		static inline void print_mlm(char *name, unsigned long b, unsigned long t)
		{
		pr_notice("%12s : 0x%08lx - 0x%08lx (%4ld MB)\n", name, b, t,
		(((t) - (b)) >> 20));
		}

		static void print_vm_layout(void)
		{
		pr_notice("Virtual kernel memory layout:\n");
		print_mlk("fixmap", (unsigned long)FIXADDR_START,
		(unsigned long)FIXADDR_TOP);
		print_mlm("pci io", (unsigned long)PCI_IO_START,
		(unsigned long)PCI_IO_END);
		print_mlm("vmemmap", (unsigned long)VMEMMAP_START,
		(unsigned long)VMEMMAP_END);
		print_mlm("vmalloc", (unsigned long)VMALLOC_START,
		(unsigned long)VMALLOC_END);
		print_mlm("lowmem", (unsigned long)PAGE_OFFSET,
		(unsigned long)high_memory);
		}
		#else
		static void print_vm_layout(void) { }
		#endif /* CONFIG_DEBUG_VM */

		void __init mem_init(void)
		{
		#ifdef CONFIG_FLATMEM
		@@ -56,6 +87,7 @@ void __init mem_init(void)
		memblock_free_all();

		mem_init_print_info(NULL);
		print_vm_layout();
		}

		#ifdef CONFIG_BLK_DEV_INITRD

+8 −8

File changed.

Contains only whitespace changes.