[PATCH] mm: Move mem_init_print_info() into mm_init()

From: Kefeng Wang <hidden>
Date: 2021-03-16 14:25:52

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, cleanup it by using void argument and move
it into mm_init().

Signed-off-by: Kefeng Wang <redacted>
---
 arch/alpha/mm/init.c             | 1 -
 arch/arc/mm/init.c               | 1 -
 arch/arm/mm/init.c               | 2 --
 arch/arm64/mm/init.c             | 2 --
 arch/csky/mm/init.c              | 1 -
 arch/h8300/mm/init.c             | 2 --
 arch/hexagon/mm/init.c           | 1 -
 arch/ia64/mm/init.c              | 1 -
 arch/m68k/mm/init.c              | 1 -
 arch/microblaze/mm/init.c        | 1 -
 arch/mips/loongson64/numa.c      | 1 -
 arch/mips/mm/init.c              | 1 -
 arch/mips/sgi-ip27/ip27-memory.c | 1 -
 arch/nds32/mm/init.c             | 1 -
 arch/nios2/mm/init.c             | 1 -
 arch/openrisc/mm/init.c          | 2 --
 arch/parisc/mm/init.c            | 2 --
 arch/powerpc/mm/mem.c            | 1 -
 arch/riscv/mm/init.c             | 1 -
 arch/s390/mm/init.c              | 2 --
 arch/sh/mm/init.c                | 1 -
 arch/sparc/mm/init_32.c          | 2 --
 arch/sparc/mm/init_64.c          | 1 -
 arch/um/kernel/mem.c             | 1 -
 arch/x86/mm/init_32.c            | 2 --
 arch/x86/mm/init_64.c            | 2 --
 arch/xtensa/mm/init.c            | 1 -
 include/linux/mm.h               | 2 +-
 init/main.c                      | 1 +
 mm/page_alloc.c                  | 2 +-
 30 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 3c42b3147fd6..a97650a618f1 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c

@@ -282,5 +282,4 @@ mem_init(void)
 	set_max_mapnr(max_low_pfn);
 	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
 	memblock_free_all();
-	mem_init_print_info(NULL);
 }

diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index ce07e697916c..33832e36bdb7 100644
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c

@@ -194,7 +194,6 @@ void __init mem_init(void)
 {
 	memblock_free_all();
 	highmem_init();
-	mem_init_print_info(NULL);
 }
 
 #ifdef CONFIG_HIGHMEM

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 828a2561b229..7022b7b5c400 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c

@@ -316,8 +316,6 @@ void __init mem_init(void)
 
 	free_highpages();
 
-	mem_init_print_info(NULL);
-
 	/*
 	 * Check boundaries twice: Some fundamental inconsistencies can
 	 * be detected at build time already.

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 3685e12aba9b..e8f29a0bb2f1 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c

@@ -491,8 +491,6 @@ void __init mem_init(void)
 	/* this will put all unused low memory onto the freelists */
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
-
 	/*
 	 * Check boundaries twice: Some fundamental inconsistencies can be
 	 * detected at build time already.

diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c
index 894050a8ce09..bf2004aa811a 100644
--- a/arch/csky/mm/init.c
+++ b/arch/csky/mm/init.c

@@ -107,7 +107,6 @@ void __init mem_init(void)
 			free_highmem_page(page);
 	}
 #endif
-	mem_init_print_info(NULL);
 }
 
 void free_initmem(void)

diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c
index 1f3b345d68b9..f7bf4693e3b2 100644
--- a/arch/h8300/mm/init.c
+++ b/arch/h8300/mm/init.c

@@ -98,6 +98,4 @@ void __init mem_init(void)
 
 	/* this will put all low memory onto the freelists */
 	memblock_free_all();
-
-	mem_init_print_info(NULL);
 }

diff --git a/arch/hexagon/mm/init.c b/arch/hexagon/mm/init.c
index f2e6c868e477..f01e91e10d95 100644
--- a/arch/hexagon/mm/init.c
+++ b/arch/hexagon/mm/init.c

@@ -55,7 +55,6 @@ void __init mem_init(void)
 {
 	/*  No idea where this is actually declared.  Seems to evade LXR.  */
 	memblock_free_all();
-	mem_init_print_info(NULL);
 
 	/*
 	 *  To-Do:  someone somewhere should wipe out the bootmem map

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 16d0d7d22657..83280e2df807 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c

@@ -659,7 +659,6 @@ mem_init (void)
 	set_max_mapnr(max_low_pfn);
 	high_memory = __va(max_low_pfn * PAGE_SIZE);
 	memblock_free_all();
-	mem_init_print_info(NULL);
 
 	/*
 	 * For fsyscall entrpoints with no light-weight handler, use the ordinary

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 14c1e541451c..1759ab875d47 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c

@@ -153,5 +153,4 @@ void __init mem_init(void)
 	/* this will put all memory onto the freelists */
 	memblock_free_all();
 	init_pointer_tables();
-	mem_init_print_info(NULL);
 }

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 05cf1fb3f5ff..ab55c70380a5 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c

@@ -131,7 +131,6 @@ void __init mem_init(void)
 	highmem_setup();
 #endif
 
-	mem_init_print_info(NULL);
 	mem_init_done = 1;
 }

diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c
index 8315c871c435..fa9b4a487a47 100644
--- a/arch/mips/loongson64/numa.c
+++ b/arch/mips/loongson64/numa.c

@@ -178,7 +178,6 @@ void __init mem_init(void)
 	high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
 	memblock_free_all();
 	setup_zero_pages();	/* This comes from node 0 */
-	mem_init_print_info(NULL);
 }
 
 /* All PCI device belongs to logical Node-0 */

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 5cb73bf74a8b..c36358758969 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c

@@ -467,7 +467,6 @@ void __init mem_init(void)
 	memblock_free_all();
 	setup_zero_pages();	/* Setup zeroed pages.  */
 	mem_init_free_highmem();
-	mem_init_print_info(NULL);
 
 #ifdef CONFIG_64BIT
 	if ((unsigned long) &_text > (unsigned long) CKSEG0)

diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 87bb6945ec25..6173684b5aaa 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c

@@ -420,5 +420,4 @@ void __init mem_init(void)
 	high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
 	memblock_free_all();
 	setup_zero_pages();	/* This comes from node 0 */
-	mem_init_print_info(NULL);
 }

diff --git a/arch/nds32/mm/init.c b/arch/nds32/mm/init.c
index fa86f7b2f416..f63f839738c4 100644
--- a/arch/nds32/mm/init.c
+++ b/arch/nds32/mm/init.c

@@ -191,7 +191,6 @@ void __init mem_init(void)
 
 	/* this will put all low memory onto the freelists */
 	memblock_free_all();
-	mem_init_print_info(NULL);
 
 	pr_info("virtual kernel memory layout:\n"
 		"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"

diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c
index 61862dbb0e32..613fcaa5988a 100644
--- a/arch/nios2/mm/init.c
+++ b/arch/nios2/mm/init.c

@@ -71,7 +71,6 @@ void __init mem_init(void)
 
 	/* this will put all memory onto the freelists */
 	memblock_free_all();
-	mem_init_print_info(NULL);
 }
 
 void __init mmu_init(void)

diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c
index bf9b2310fc93..d5641198b90c 100644
--- a/arch/openrisc/mm/init.c
+++ b/arch/openrisc/mm/init.c

@@ -211,8 +211,6 @@ void __init mem_init(void)
 	/* this will put all low memory onto the freelists */
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
-
 	printk("mem_init_done ...........................................\n");
 	mem_init_done = 1;
 	return;

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 9ca4e4ff6895..591a4e939415 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c

@@ -573,8 +573,6 @@ void __init mem_init(void)
 #endif
 		parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START);
 
-	mem_init_print_info(NULL);
-
 #if 0
 	/*
 	 * Do not expose the virtual kernel memory layout to userspace.

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 4e8ce6d85232..7e11c4cb08b8 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c

@@ -312,7 +312,6 @@ void __init mem_init(void)
 		(mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) - 1;
 #endif
 
-	mem_init_print_info(NULL);
 #ifdef CONFIG_PPC32
 	pr_info("Kernel virtual memory layout:\n");
 #ifdef CONFIG_KASAN

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 7f5036fbee8c..3c5ee3b7d811 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c

@@ -102,7 +102,6 @@ void __init mem_init(void)
 	high_memory = (void *)(__va(PFN_PHYS(max_low_pfn)));
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
 	print_vm_layout();
 }

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 0e76b2127dc6..8ac710de1ab1 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c

@@ -209,8 +209,6 @@ void __init mem_init(void)
 	setup_zero_pages();	/* Setup zeroed pages. */
 
 	cmma_init_nodat();
-
-	mem_init_print_info(NULL);
 }
 
 void free_initmem(void)

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 0db6919af8d3..168d7d4dd735 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c

@@ -359,7 +359,6 @@ void __init mem_init(void)
 
 	vsyscall_init();
 
-	mem_init_print_info(NULL);
 	pr_info("virtual kernel memory layout:\n"
 		"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"
 		"    vmalloc : 0x%08lx - 0x%08lx   (%4ld MB)\n"

diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index 6139c5700ccc..1e9f577f084d 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c

@@ -292,8 +292,6 @@ void __init mem_init(void)
 
 		map_high_region(start_pfn, end_pfn);
 	}
-
-	mem_init_print_info(NULL);
 }
 
 void sparc_flush_page_to_ram(struct page *page)

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 182bb7bdaa0a..e454f179cf5d 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c

@@ -2520,7 +2520,6 @@ void __init mem_init(void)
 	}
 	mark_page_reserved(mem_map_zero);
 
-	mem_init_print_info(NULL);
 
 	if (tlb_type == cheetah || tlb_type == cheetah_plus)
 		cheetah_ecache_flush_init();

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 9242dc91d751..9019ff5905b1 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c

@@ -54,7 +54,6 @@ void __init mem_init(void)
 	memblock_free_all();
 	max_low_pfn = totalram_pages();
 	max_pfn = max_low_pfn;
-	mem_init_print_info(NULL);
 	kmalloc_ok = 1;
 }

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index da31c2635ee4..21ffb03f6c72 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c

@@ -755,8 +755,6 @@ void __init mem_init(void)
 	after_bootmem = 1;
 	x86_init.hyper.init_after_bootmem();
 
-	mem_init_print_info(NULL);
-
 	/*
 	 * Check boundaries twice: Some fundamental inconsistencies can
 	 * be detected at build time already.

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 5430c81eefc9..aa8387aab9c1 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c

@@ -1350,8 +1350,6 @@ void __init mem_init(void)
 		kclist_add(&kcore_vsyscall, (void *)VSYSCALL_ADDR, PAGE_SIZE, KCORE_USER);
 
 	preallocate_vmalloc_pages();
-
-	mem_init_print_info(NULL);
 }
 
 #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT

diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 2daeba9e454e..6a32b2cf2718 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c

@@ -119,7 +119,6 @@ void __init mem_init(void)
 
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
 	pr_info("virtual kernel memory layout:\n"
 #ifdef CONFIG_KASAN
 		"    kasan   : 0x%08lx - 0x%08lx  (%5lu MB)\n"

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 89314651dd62..c2e0b3495c5a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h

@@ -2373,7 +2373,7 @@ extern unsigned long free_reserved_area(void *start, void *end,
 					int poison, const char *s);
 
 extern void adjust_managed_page_count(struct page *page, long count);
-extern void mem_init_print_info(const char *str);
+extern void mem_init_print_info(void);
 
 extern void reserve_bootmem_region(phys_addr_t start, phys_addr_t end);

diff --git a/init/main.c b/init/main.c
index 53b278845b88..5581af5b4cb7 100644
--- a/init/main.c
+++ b/init/main.c

@@ -830,6 +830,7 @@ static void __init mm_init(void)
 	report_meminit();
 	stack_depot_init();
 	mem_init();
+	mem_init_print_info();
 	/* page_owner must be initialized after buddy is ready */
 	page_ext_init_flatmem_late();
 	kmem_cache_init();

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 55d938297ce6..e4a6bf69c806 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c

@@ -7728,7 +7728,7 @@ unsigned long free_reserved_area(void *start, void *end, int poison, const char
 	return pages;
 }
 
-void __init mem_init_print_info(const char *str)
+void __init mem_init_print_info(void)
 {
 	unsigned long physpages, codesize, datasize, rosize, bss_size;
 	unsigned long init_code_size, init_data_size;

-- 
2.26.2

Re: [PATCH] mm: Move mem_init_print_info() into mm_init()

From: Christophe Leroy <hidden>
Date: 2021-03-16 14:48:02


Le 16/03/2021 à 15:26, Kefeng Wang a écrit :

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, cleanup it by using void argument and move
it into mm_init().

Signed-off-by: Kefeng Wang <redacted>
---
  arch/alpha/mm/init.c             | 1 -
  arch/arc/mm/init.c               | 1 -
  arch/arm/mm/init.c               | 2 --
  arch/arm64/mm/init.c             | 2 --
  arch/csky/mm/init.c              | 1 -
  arch/h8300/mm/init.c             | 2 --
  arch/hexagon/mm/init.c           | 1 -
  arch/ia64/mm/init.c              | 1 -
  arch/m68k/mm/init.c              | 1 -
  arch/microblaze/mm/init.c        | 1 -
  arch/mips/loongson64/numa.c      | 1 -
  arch/mips/mm/init.c              | 1 -
  arch/mips/sgi-ip27/ip27-memory.c | 1 -
  arch/nds32/mm/init.c             | 1 -
  arch/nios2/mm/init.c             | 1 -
  arch/openrisc/mm/init.c          | 2 --
  arch/parisc/mm/init.c            | 2 --
  arch/powerpc/mm/mem.c            | 1 -
  arch/riscv/mm/init.c             | 1 -
  arch/s390/mm/init.c              | 2 --
  arch/sh/mm/init.c                | 1 -
  arch/sparc/mm/init_32.c          | 2 --
  arch/sparc/mm/init_64.c          | 1 -
  arch/um/kernel/mem.c             | 1 -
  arch/x86/mm/init_32.c            | 2 --
  arch/x86/mm/init_64.c            | 2 --
  arch/xtensa/mm/init.c            | 1 -
  include/linux/mm.h               | 2 +-
  init/main.c                      | 1 +
  mm/page_alloc.c                  | 2 +-
  30 files changed, 3 insertions(+), 38 deletions(-)

quoted hunk

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 55d938297ce6..e4a6bf69c806 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c

@@ -7728,7 +7728,7 @@ unsigned long free_reserved_area(void *start, void *end, int poison, const char
  	return pages;
  }
  
-void __init mem_init_print_info(const char *str)
+void __init mem_init_print_info(void)
  {
  	unsigned long physpages, codesize, datasize, rosize, bss_size;
  	unsigned long init_code_size, init_data_size;

And what about the 'str' in the last line of the function ?

	pr_info("Memory: %luK/%luK available (%luK kernel code, %luK rwdata, %luK rodata, %luK init, %luK 
bss, %luK reserved, %luK cma-reserved"
#ifdef	CONFIG_HIGHMEM
		", %luK highmem"
#endif
		"%s%s)\n",
		nr_free_pages() << (PAGE_SHIFT - 10),
		physpages << (PAGE_SHIFT - 10),
		codesize >> 10, datasize >> 10, rosize >> 10,
		(init_data_size + init_code_size) >> 10, bss_size >> 10,
		(physpages - totalram_pages() - totalcma_pages) << (PAGE_SHIFT - 10),
		totalcma_pages << (PAGE_SHIFT - 10),
#ifdef	CONFIG_HIGHMEM
		totalhigh_pages() << (PAGE_SHIFT - 10),
#endif
		str ? ", " : "", str ? str : "");


Christophe

Re: [PATCH] mm: Move mem_init_print_info() into mm_init()

From: Kefeng Wang <hidden>
Date: 2021-03-16 15:05:13

On 2021/3/16 22:47, Christophe Leroy wrote:


Le 16/03/2021 à 15:26, Kefeng Wang a écrit :

quoted

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, cleanup it by using void argument and move
it into mm_init().

Signed-off-by: Kefeng Wang <redacted>
---
  arch/alpha/mm/init.c             | 1 -
  arch/arc/mm/init.c               | 1 -
  arch/arm/mm/init.c               | 2 --
  arch/arm64/mm/init.c             | 2 --
  arch/csky/mm/init.c              | 1 -
  arch/h8300/mm/init.c             | 2 --
  arch/hexagon/mm/init.c           | 1 -
  arch/ia64/mm/init.c              | 1 -
  arch/m68k/mm/init.c              | 1 -
  arch/microblaze/mm/init.c        | 1 -
  arch/mips/loongson64/numa.c      | 1 -
  arch/mips/mm/init.c              | 1 -
  arch/mips/sgi-ip27/ip27-memory.c | 1 -
  arch/nds32/mm/init.c             | 1 -
  arch/nios2/mm/init.c             | 1 -
  arch/openrisc/mm/init.c          | 2 --
  arch/parisc/mm/init.c            | 2 --
  arch/powerpc/mm/mem.c            | 1 -
  arch/riscv/mm/init.c             | 1 -
  arch/s390/mm/init.c              | 2 --
  arch/sh/mm/init.c                | 1 -
  arch/sparc/mm/init_32.c          | 2 --
  arch/sparc/mm/init_64.c          | 1 -
  arch/um/kernel/mem.c             | 1 -
  arch/x86/mm/init_32.c            | 2 --
  arch/x86/mm/init_64.c            | 2 --
  arch/xtensa/mm/init.c            | 1 -
  include/linux/mm.h               | 2 +-
  init/main.c                      | 1 +
  mm/page_alloc.c                  | 2 +-
  30 files changed, 3 insertions(+), 38 deletions(-)

quoted

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 55d938297ce6..e4a6bf69c806 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c

@@ -7728,7 +7728,7 @@ unsigned long free_reserved_area(void *start,

void *end, int poison, const char
      return pages;
  }
  -void __init mem_init_print_info(const char *str)
+void __init mem_init_print_info(void)
  {
      unsigned long physpages, codesize, datasize, rosize, bss_size;
      unsigned long init_code_size, init_data_size;

And what about the 'str' in the last line of the function ?

    pr_info("Memory: %luK/%luK available (%luK kernel code, %luK 
rwdata, %luK rodata, %luK init, %luK bss, %luK reserved, %luK 
cma-reserved"
#ifdef    CONFIG_HIGHMEM
        ", %luK highmem"
#endif
        "%s%s)\n",
        nr_free_pages() << (PAGE_SHIFT - 10),
        physpages << (PAGE_SHIFT - 10),
        codesize >> 10, datasize >> 10, rosize >> 10,
        (init_data_size + init_code_size) >> 10, bss_size >> 10,
        (physpages - totalram_pages() - totalcma_pages) << (PAGE_SHIFT 
- 10),
        totalcma_pages << (PAGE_SHIFT - 10),
#ifdef    CONFIG_HIGHMEM
        totalhigh_pages() << (PAGE_SHIFT - 10),
#endif
        str ? ", " : "", str ? str : "");

oh,   I send a bad version，firstly I want to split two patches, one for 
function move, one for function change.

sorry, please ignore it， thanks for your remind.


Christophe
.

[PATCH RESEND] mm: Move mem_init_print_info() into mm_init()

From: Kefeng Wang <hidden>
Date: 2021-03-16 15:27:58

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Signed-off-by: Kefeng Wang <redacted>
---

Resend with 'str' line cleanup, and only test on ARM64 qemu.

 arch/alpha/mm/init.c             | 1 -
 arch/arc/mm/init.c               | 1 -
 arch/arm/mm/init.c               | 2 --
 arch/arm64/mm/init.c             | 2 --
 arch/csky/mm/init.c              | 1 -
 arch/h8300/mm/init.c             | 2 --
 arch/hexagon/mm/init.c           | 1 -
 arch/ia64/mm/init.c              | 1 -
 arch/m68k/mm/init.c              | 1 -
 arch/microblaze/mm/init.c        | 1 -
 arch/mips/loongson64/numa.c      | 1 -
 arch/mips/mm/init.c              | 1 -
 arch/mips/sgi-ip27/ip27-memory.c | 1 -
 arch/nds32/mm/init.c             | 1 -
 arch/nios2/mm/init.c             | 1 -
 arch/openrisc/mm/init.c          | 2 --
 arch/parisc/mm/init.c            | 2 --
 arch/powerpc/mm/mem.c            | 1 -
 arch/riscv/mm/init.c             | 1 -
 arch/s390/mm/init.c              | 2 --
 arch/sh/mm/init.c                | 1 -
 arch/sparc/mm/init_32.c          | 2 --
 arch/sparc/mm/init_64.c          | 1 -
 arch/um/kernel/mem.c             | 1 -
 arch/x86/mm/init_32.c            | 2 --
 arch/x86/mm/init_64.c            | 2 --
 arch/xtensa/mm/init.c            | 1 -
 include/linux/mm.h               | 2 +-
 init/main.c                      | 1 +
 mm/page_alloc.c                  | 6 +++---
 30 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 3c42b3147fd6..a97650a618f1 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c

@@ -282,5 +282,4 @@ mem_init(void)
 	set_max_mapnr(max_low_pfn);
 	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
 	memblock_free_all();
-	mem_init_print_info(NULL);
 }

diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index ce07e697916c..33832e36bdb7 100644
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c

@@ -194,7 +194,6 @@ void __init mem_init(void)
 {
 	memblock_free_all();
 	highmem_init();
-	mem_init_print_info(NULL);
 }
 
 #ifdef CONFIG_HIGHMEM

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 828a2561b229..7022b7b5c400 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c

@@ -316,8 +316,6 @@ void __init mem_init(void)
 
 	free_highpages();
 
-	mem_init_print_info(NULL);
-
 	/*
 	 * Check boundaries twice: Some fundamental inconsistencies can
 	 * be detected at build time already.

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 3685e12aba9b..e8f29a0bb2f1 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c

@@ -491,8 +491,6 @@ void __init mem_init(void)
 	/* this will put all unused low memory onto the freelists */
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
-
 	/*
 	 * Check boundaries twice: Some fundamental inconsistencies can be
 	 * detected at build time already.

diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c
index 894050a8ce09..bf2004aa811a 100644
--- a/arch/csky/mm/init.c
+++ b/arch/csky/mm/init.c

@@ -107,7 +107,6 @@ void __init mem_init(void)
 			free_highmem_page(page);
 	}
 #endif
-	mem_init_print_info(NULL);
 }
 
 void free_initmem(void)

diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c
index 1f3b345d68b9..f7bf4693e3b2 100644
--- a/arch/h8300/mm/init.c
+++ b/arch/h8300/mm/init.c

@@ -98,6 +98,4 @@ void __init mem_init(void)
 
 	/* this will put all low memory onto the freelists */
 	memblock_free_all();
-
-	mem_init_print_info(NULL);
 }

diff --git a/arch/hexagon/mm/init.c b/arch/hexagon/mm/init.c
index f2e6c868e477..f01e91e10d95 100644
--- a/arch/hexagon/mm/init.c
+++ b/arch/hexagon/mm/init.c

@@ -55,7 +55,6 @@ void __init mem_init(void)
 {
 	/*  No idea where this is actually declared.  Seems to evade LXR.  */
 	memblock_free_all();
-	mem_init_print_info(NULL);
 
 	/*
 	 *  To-Do:  someone somewhere should wipe out the bootmem map

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 16d0d7d22657..83280e2df807 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c

@@ -659,7 +659,6 @@ mem_init (void)
 	set_max_mapnr(max_low_pfn);
 	high_memory = __va(max_low_pfn * PAGE_SIZE);
 	memblock_free_all();
-	mem_init_print_info(NULL);
 
 	/*
 	 * For fsyscall entrpoints with no light-weight handler, use the ordinary

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 14c1e541451c..1759ab875d47 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c

@@ -153,5 +153,4 @@ void __init mem_init(void)
 	/* this will put all memory onto the freelists */
 	memblock_free_all();
 	init_pointer_tables();
-	mem_init_print_info(NULL);
 }

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 05cf1fb3f5ff..ab55c70380a5 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c

@@ -131,7 +131,6 @@ void __init mem_init(void)
 	highmem_setup();
 #endif
 
-	mem_init_print_info(NULL);
 	mem_init_done = 1;
 }

diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c
index 8315c871c435..fa9b4a487a47 100644
--- a/arch/mips/loongson64/numa.c
+++ b/arch/mips/loongson64/numa.c

@@ -178,7 +178,6 @@ void __init mem_init(void)
 	high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
 	memblock_free_all();
 	setup_zero_pages();	/* This comes from node 0 */
-	mem_init_print_info(NULL);
 }
 
 /* All PCI device belongs to logical Node-0 */

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 5cb73bf74a8b..c36358758969 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c

@@ -467,7 +467,6 @@ void __init mem_init(void)
 	memblock_free_all();
 	setup_zero_pages();	/* Setup zeroed pages.  */
 	mem_init_free_highmem();
-	mem_init_print_info(NULL);
 
 #ifdef CONFIG_64BIT
 	if ((unsigned long) &_text > (unsigned long) CKSEG0)

diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 87bb6945ec25..6173684b5aaa 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c

@@ -420,5 +420,4 @@ void __init mem_init(void)
 	high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
 	memblock_free_all();
 	setup_zero_pages();	/* This comes from node 0 */
-	mem_init_print_info(NULL);
 }

diff --git a/arch/nds32/mm/init.c b/arch/nds32/mm/init.c
index fa86f7b2f416..f63f839738c4 100644
--- a/arch/nds32/mm/init.c
+++ b/arch/nds32/mm/init.c

@@ -191,7 +191,6 @@ void __init mem_init(void)
 
 	/* this will put all low memory onto the freelists */
 	memblock_free_all();
-	mem_init_print_info(NULL);
 
 	pr_info("virtual kernel memory layout:\n"
 		"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"

diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c
index 61862dbb0e32..613fcaa5988a 100644
--- a/arch/nios2/mm/init.c
+++ b/arch/nios2/mm/init.c

@@ -71,7 +71,6 @@ void __init mem_init(void)
 
 	/* this will put all memory onto the freelists */
 	memblock_free_all();
-	mem_init_print_info(NULL);
 }
 
 void __init mmu_init(void)

diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c
index bf9b2310fc93..d5641198b90c 100644
--- a/arch/openrisc/mm/init.c
+++ b/arch/openrisc/mm/init.c

@@ -211,8 +211,6 @@ void __init mem_init(void)
 	/* this will put all low memory onto the freelists */
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
-
 	printk("mem_init_done ...........................................\n");
 	mem_init_done = 1;
 	return;

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 9ca4e4ff6895..591a4e939415 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c

@@ -573,8 +573,6 @@ void __init mem_init(void)
 #endif
 		parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START);
 
-	mem_init_print_info(NULL);
-
 #if 0
 	/*
 	 * Do not expose the virtual kernel memory layout to userspace.

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 4e8ce6d85232..7e11c4cb08b8 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c

@@ -312,7 +312,6 @@ void __init mem_init(void)
 		(mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) - 1;
 #endif
 
-	mem_init_print_info(NULL);
 #ifdef CONFIG_PPC32
 	pr_info("Kernel virtual memory layout:\n");
 #ifdef CONFIG_KASAN

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 7f5036fbee8c..3c5ee3b7d811 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c

@@ -102,7 +102,6 @@ void __init mem_init(void)
 	high_memory = (void *)(__va(PFN_PHYS(max_low_pfn)));
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
 	print_vm_layout();
 }

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 0e76b2127dc6..8ac710de1ab1 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c

@@ -209,8 +209,6 @@ void __init mem_init(void)
 	setup_zero_pages();	/* Setup zeroed pages. */
 
 	cmma_init_nodat();
-
-	mem_init_print_info(NULL);
 }
 
 void free_initmem(void)

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 0db6919af8d3..168d7d4dd735 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c

@@ -359,7 +359,6 @@ void __init mem_init(void)
 
 	vsyscall_init();
 
-	mem_init_print_info(NULL);
 	pr_info("virtual kernel memory layout:\n"
 		"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"
 		"    vmalloc : 0x%08lx - 0x%08lx   (%4ld MB)\n"

diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index 6139c5700ccc..1e9f577f084d 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c

@@ -292,8 +292,6 @@ void __init mem_init(void)
 
 		map_high_region(start_pfn, end_pfn);
 	}
-
-	mem_init_print_info(NULL);
 }
 
 void sparc_flush_page_to_ram(struct page *page)

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 182bb7bdaa0a..e454f179cf5d 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c

@@ -2520,7 +2520,6 @@ void __init mem_init(void)
 	}
 	mark_page_reserved(mem_map_zero);
 
-	mem_init_print_info(NULL);
 
 	if (tlb_type == cheetah || tlb_type == cheetah_plus)
 		cheetah_ecache_flush_init();

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 9242dc91d751..9019ff5905b1 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c

@@ -54,7 +54,6 @@ void __init mem_init(void)
 	memblock_free_all();
 	max_low_pfn = totalram_pages();
 	max_pfn = max_low_pfn;
-	mem_init_print_info(NULL);
 	kmalloc_ok = 1;
 }

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index da31c2635ee4..21ffb03f6c72 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c

@@ -755,8 +755,6 @@ void __init mem_init(void)
 	after_bootmem = 1;
 	x86_init.hyper.init_after_bootmem();
 
-	mem_init_print_info(NULL);
-
 	/*
 	 * Check boundaries twice: Some fundamental inconsistencies can
 	 * be detected at build time already.

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 5430c81eefc9..aa8387aab9c1 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c

@@ -1350,8 +1350,6 @@ void __init mem_init(void)
 		kclist_add(&kcore_vsyscall, (void *)VSYSCALL_ADDR, PAGE_SIZE, KCORE_USER);
 
 	preallocate_vmalloc_pages();
-
-	mem_init_print_info(NULL);
 }
 
 #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT

diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 2daeba9e454e..6a32b2cf2718 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c

@@ -119,7 +119,6 @@ void __init mem_init(void)
 
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
 	pr_info("virtual kernel memory layout:\n"
 #ifdef CONFIG_KASAN
 		"    kasan   : 0x%08lx - 0x%08lx  (%5lu MB)\n"

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 89314651dd62..c2e0b3495c5a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h

@@ -2373,7 +2373,7 @@ extern unsigned long free_reserved_area(void *start, void *end,
 					int poison, const char *s);
 
 extern void adjust_managed_page_count(struct page *page, long count);
-extern void mem_init_print_info(const char *str);
+extern void mem_init_print_info(void);
 
 extern void reserve_bootmem_region(phys_addr_t start, phys_addr_t end);

diff --git a/init/main.c b/init/main.c
index 53b278845b88..5581af5b4cb7 100644
--- a/init/main.c
+++ b/init/main.c

@@ -830,6 +830,7 @@ static void __init mm_init(void)
 	report_meminit();
 	stack_depot_init();
 	mem_init();
+	mem_init_print_info();
 	/* page_owner must be initialized after buddy is ready */
 	page_ext_init_flatmem_late();
 	kmem_cache_init();

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 55d938297ce6..cf5a2114c6d4 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c

@@ -7728,7 +7728,7 @@ unsigned long free_reserved_area(void *start, void *end, int poison, const char
 	return pages;
 }
 
-void __init mem_init_print_info(const char *str)
+void __init mem_init_print_info(void)
 {
 	unsigned long physpages, codesize, datasize, rosize, bss_size;
 	unsigned long init_code_size, init_data_size;

@@ -7767,7 +7767,7 @@ void __init mem_init_print_info(const char *str)
 #ifdef	CONFIG_HIGHMEM
 		", %luK highmem"
 #endif
-		"%s%s)\n",
+		"%s)\n",
 		nr_free_pages() << (PAGE_SHIFT - 10),
 		physpages << (PAGE_SHIFT - 10),
 		codesize >> 10, datasize >> 10, rosize >> 10,

@@ -7777,7 +7777,7 @@ void __init mem_init_print_info(const char *str)
 #ifdef	CONFIG_HIGHMEM
 		totalhigh_pages() << (PAGE_SHIFT - 10),
 #endif
-		str ? ", " : "", str ? str : "");
+		"");
 }
 
 /**

-- 
2.26.2

Re: [PATCH RESEND] mm: Move mem_init_print_info() into mm_init()

From: Christophe Leroy <hidden>
Date: 2021-03-16 15:46:24


Le 16/03/2021 à 16:29, Kefeng Wang a écrit :

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Signed-off-by: Kefeng Wang <redacted>
---

Resend with 'str' line cleanup, and only test on ARM64 qemu.

  arch/alpha/mm/init.c             | 1 -
  arch/arc/mm/init.c               | 1 -
  arch/arm/mm/init.c               | 2 --
  arch/arm64/mm/init.c             | 2 --
  arch/csky/mm/init.c              | 1 -
  arch/h8300/mm/init.c             | 2 --
  arch/hexagon/mm/init.c           | 1 -
  arch/ia64/mm/init.c              | 1 -
  arch/m68k/mm/init.c              | 1 -
  arch/microblaze/mm/init.c        | 1 -
  arch/mips/loongson64/numa.c      | 1 -
  arch/mips/mm/init.c              | 1 -
  arch/mips/sgi-ip27/ip27-memory.c | 1 -
  arch/nds32/mm/init.c             | 1 -
  arch/nios2/mm/init.c             | 1 -
  arch/openrisc/mm/init.c          | 2 --
  arch/parisc/mm/init.c            | 2 --
  arch/powerpc/mm/mem.c            | 1 -
  arch/riscv/mm/init.c             | 1 -
  arch/s390/mm/init.c              | 2 --
  arch/sh/mm/init.c                | 1 -
  arch/sparc/mm/init_32.c          | 2 --
  arch/sparc/mm/init_64.c          | 1 -
  arch/um/kernel/mem.c             | 1 -
  arch/x86/mm/init_32.c            | 2 --
  arch/x86/mm/init_64.c            | 2 --
  arch/xtensa/mm/init.c            | 1 -
  include/linux/mm.h               | 2 +-
  init/main.c                      | 1 +
  mm/page_alloc.c                  | 6 +++---
  30 files changed, 5 insertions(+), 40 deletions(-)

quoted hunk

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 55d938297ce6..cf5a2114c6d4 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c

@@ -7728,7 +7728,7 @@ unsigned long free_reserved_area(void *start, void *end, int poison, const char
  	return pages;
  }
  
-void __init mem_init_print_info(const char *str)
+void __init mem_init_print_info(void)
  {
  	unsigned long physpages, codesize, datasize, rosize, bss_size;
  	unsigned long init_code_size, init_data_size;

@@ -7767,7 +7767,7 @@ void __init mem_init_print_info(const char *str)
  #ifdef	CONFIG_HIGHMEM
  		", %luK highmem"
  #endif
-		"%s%s)\n",
+		"%s)\n",
  		nr_free_pages() << (PAGE_SHIFT - 10),
  		physpages << (PAGE_SHIFT - 10),
  		codesize >> 10, datasize >> 10, rosize >> 10,

@@ -7777,7 +7777,7 @@ void __init mem_init_print_info(const char *str)
  #ifdef	CONFIG_HIGHMEM
  		totalhigh_pages() << (PAGE_SHIFT - 10),
  #endif
-		str ? ", " : "", str ? str : "");
+		"");
  }
  
  /**

What is the benefit of a %s to print a constant "" ?

You should tidy up completely.

Christophe

Re: [PATCH] mm: Move mem_init_print_info() into mm_init()

From: Dave Hansen <hidden>
Date: 2021-03-16 21:17:24

On 3/16/21 7:26 AM, Kefeng Wang wrote:

quoted hunk

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 5430c81eefc9..aa8387aab9c1 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c

@@ -1350,8 +1350,6 @@ void __init mem_init(void)
 		kclist_add(&kcore_vsyscall, (void *)VSYSCALL_ADDR, PAGE_SIZE, KCORE_USER);
 
 	preallocate_vmalloc_pages();
-
-	mem_init_print_info(NULL);
 }

Ignoring any issues with the printk...

Looks harmless enough on x86.  The 32-bit code has some cruft in
mem_init() after mem_init_print_info(), so this patch will change the
location of the mem_init_print_info(), but I think it's actually for the
better, since it will be pushed later in boot.  As long as the x86
pieces stay the same:

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>

[PATCH v2] mm: Move mem_init_print_info() into mm_init()

From: Kefeng Wang <hidden>
Date: 2021-03-17 01:51:21

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Kefeng Wang <redacted>
---
v2:
- Cleanup 'str' line suggested by Christophe and ACK

 arch/alpha/mm/init.c             |  1 -
 arch/arc/mm/init.c               |  1 -
 arch/arm/mm/init.c               |  2 --
 arch/arm64/mm/init.c             |  2 --
 arch/csky/mm/init.c              |  1 -
 arch/h8300/mm/init.c             |  2 --
 arch/hexagon/mm/init.c           |  1 -
 arch/ia64/mm/init.c              |  1 -
 arch/m68k/mm/init.c              |  1 -
 arch/microblaze/mm/init.c        |  1 -
 arch/mips/loongson64/numa.c      |  1 -
 arch/mips/mm/init.c              |  1 -
 arch/mips/sgi-ip27/ip27-memory.c |  1 -
 arch/nds32/mm/init.c             |  1 -
 arch/nios2/mm/init.c             |  1 -
 arch/openrisc/mm/init.c          |  2 --
 arch/parisc/mm/init.c            |  2 --
 arch/powerpc/mm/mem.c            |  1 -
 arch/riscv/mm/init.c             |  1 -
 arch/s390/mm/init.c              |  2 --
 arch/sh/mm/init.c                |  1 -
 arch/sparc/mm/init_32.c          |  2 --
 arch/sparc/mm/init_64.c          |  1 -
 arch/um/kernel/mem.c             |  1 -
 arch/x86/mm/init_32.c            |  2 --
 arch/x86/mm/init_64.c            |  2 --
 arch/xtensa/mm/init.c            |  1 -
 include/linux/mm.h               |  2 +-
 init/main.c                      |  1 +
 mm/page_alloc.c                  | 10 +++++-----
 30 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 3c42b3147fd6..a97650a618f1 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c

@@ -282,5 +282,4 @@ mem_init(void)
 	set_max_mapnr(max_low_pfn);
 	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
 	memblock_free_all();
-	mem_init_print_info(NULL);
 }

diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index ce07e697916c..33832e36bdb7 100644
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c

@@ -194,7 +194,6 @@ void __init mem_init(void)
 {
 	memblock_free_all();
 	highmem_init();
-	mem_init_print_info(NULL);
 }
 
 #ifdef CONFIG_HIGHMEM

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 828a2561b229..7022b7b5c400 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c

@@ -316,8 +316,6 @@ void __init mem_init(void)
 
 	free_highpages();
 
-	mem_init_print_info(NULL);
-
 	/*
 	 * Check boundaries twice: Some fundamental inconsistencies can
 	 * be detected at build time already.

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 3685e12aba9b..e8f29a0bb2f1 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c

@@ -491,8 +491,6 @@ void __init mem_init(void)
 	/* this will put all unused low memory onto the freelists */
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
-
 	/*
 	 * Check boundaries twice: Some fundamental inconsistencies can be
 	 * detected at build time already.

diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c
index 894050a8ce09..bf2004aa811a 100644
--- a/arch/csky/mm/init.c
+++ b/arch/csky/mm/init.c

@@ -107,7 +107,6 @@ void __init mem_init(void)
 			free_highmem_page(page);
 	}
 #endif
-	mem_init_print_info(NULL);
 }
 
 void free_initmem(void)

diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c
index 1f3b345d68b9..f7bf4693e3b2 100644
--- a/arch/h8300/mm/init.c
+++ b/arch/h8300/mm/init.c

@@ -98,6 +98,4 @@ void __init mem_init(void)
 
 	/* this will put all low memory onto the freelists */
 	memblock_free_all();
-
-	mem_init_print_info(NULL);
 }

diff --git a/arch/hexagon/mm/init.c b/arch/hexagon/mm/init.c
index f2e6c868e477..f01e91e10d95 100644
--- a/arch/hexagon/mm/init.c
+++ b/arch/hexagon/mm/init.c

@@ -55,7 +55,6 @@ void __init mem_init(void)
 {
 	/*  No idea where this is actually declared.  Seems to evade LXR.  */
 	memblock_free_all();
-	mem_init_print_info(NULL);
 
 	/*
 	 *  To-Do:  someone somewhere should wipe out the bootmem map

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 16d0d7d22657..83280e2df807 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c

@@ -659,7 +659,6 @@ mem_init (void)
 	set_max_mapnr(max_low_pfn);
 	high_memory = __va(max_low_pfn * PAGE_SIZE);
 	memblock_free_all();
-	mem_init_print_info(NULL);
 
 	/*
 	 * For fsyscall entrpoints with no light-weight handler, use the ordinary

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 14c1e541451c..1759ab875d47 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c

@@ -153,5 +153,4 @@ void __init mem_init(void)
 	/* this will put all memory onto the freelists */
 	memblock_free_all();
 	init_pointer_tables();
-	mem_init_print_info(NULL);
 }

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 05cf1fb3f5ff..ab55c70380a5 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c

@@ -131,7 +131,6 @@ void __init mem_init(void)
 	highmem_setup();
 #endif
 
-	mem_init_print_info(NULL);
 	mem_init_done = 1;
 }

diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c
index 8315c871c435..fa9b4a487a47 100644
--- a/arch/mips/loongson64/numa.c
+++ b/arch/mips/loongson64/numa.c

@@ -178,7 +178,6 @@ void __init mem_init(void)
 	high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
 	memblock_free_all();
 	setup_zero_pages();	/* This comes from node 0 */
-	mem_init_print_info(NULL);
 }
 
 /* All PCI device belongs to logical Node-0 */

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 5cb73bf74a8b..c36358758969 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c

@@ -467,7 +467,6 @@ void __init mem_init(void)
 	memblock_free_all();
 	setup_zero_pages();	/* Setup zeroed pages.  */
 	mem_init_free_highmem();
-	mem_init_print_info(NULL);
 
 #ifdef CONFIG_64BIT
 	if ((unsigned long) &_text > (unsigned long) CKSEG0)

diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 87bb6945ec25..6173684b5aaa 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c

@@ -420,5 +420,4 @@ void __init mem_init(void)
 	high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
 	memblock_free_all();
 	setup_zero_pages();	/* This comes from node 0 */
-	mem_init_print_info(NULL);
 }

diff --git a/arch/nds32/mm/init.c b/arch/nds32/mm/init.c
index fa86f7b2f416..f63f839738c4 100644
--- a/arch/nds32/mm/init.c
+++ b/arch/nds32/mm/init.c

@@ -191,7 +191,6 @@ void __init mem_init(void)
 
 	/* this will put all low memory onto the freelists */
 	memblock_free_all();
-	mem_init_print_info(NULL);
 
 	pr_info("virtual kernel memory layout:\n"
 		"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"

diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c
index 61862dbb0e32..613fcaa5988a 100644
--- a/arch/nios2/mm/init.c
+++ b/arch/nios2/mm/init.c

@@ -71,7 +71,6 @@ void __init mem_init(void)
 
 	/* this will put all memory onto the freelists */
 	memblock_free_all();
-	mem_init_print_info(NULL);
 }
 
 void __init mmu_init(void)

diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c
index bf9b2310fc93..d5641198b90c 100644
--- a/arch/openrisc/mm/init.c
+++ b/arch/openrisc/mm/init.c

@@ -211,8 +211,6 @@ void __init mem_init(void)
 	/* this will put all low memory onto the freelists */
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
-
 	printk("mem_init_done ...........................................\n");
 	mem_init_done = 1;
 	return;

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 9ca4e4ff6895..591a4e939415 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c

@@ -573,8 +573,6 @@ void __init mem_init(void)
 #endif
 		parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START);
 
-	mem_init_print_info(NULL);
-
 #if 0
 	/*
 	 * Do not expose the virtual kernel memory layout to userspace.

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 4e8ce6d85232..7e11c4cb08b8 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c

@@ -312,7 +312,6 @@ void __init mem_init(void)
 		(mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) - 1;
 #endif
 
-	mem_init_print_info(NULL);
 #ifdef CONFIG_PPC32
 	pr_info("Kernel virtual memory layout:\n");
 #ifdef CONFIG_KASAN

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 7f5036fbee8c..3c5ee3b7d811 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c

@@ -102,7 +102,6 @@ void __init mem_init(void)
 	high_memory = (void *)(__va(PFN_PHYS(max_low_pfn)));
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
 	print_vm_layout();
 }

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 0e76b2127dc6..8ac710de1ab1 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c

@@ -209,8 +209,6 @@ void __init mem_init(void)
 	setup_zero_pages();	/* Setup zeroed pages. */
 
 	cmma_init_nodat();
-
-	mem_init_print_info(NULL);
 }
 
 void free_initmem(void)

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 0db6919af8d3..168d7d4dd735 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c

@@ -359,7 +359,6 @@ void __init mem_init(void)
 
 	vsyscall_init();
 
-	mem_init_print_info(NULL);
 	pr_info("virtual kernel memory layout:\n"
 		"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"
 		"    vmalloc : 0x%08lx - 0x%08lx   (%4ld MB)\n"

diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index 6139c5700ccc..1e9f577f084d 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c

@@ -292,8 +292,6 @@ void __init mem_init(void)
 
 		map_high_region(start_pfn, end_pfn);
 	}
-
-	mem_init_print_info(NULL);
 }
 
 void sparc_flush_page_to_ram(struct page *page)

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 182bb7bdaa0a..e454f179cf5d 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c

@@ -2520,7 +2520,6 @@ void __init mem_init(void)
 	}
 	mark_page_reserved(mem_map_zero);
 
-	mem_init_print_info(NULL);
 
 	if (tlb_type == cheetah || tlb_type == cheetah_plus)
 		cheetah_ecache_flush_init();

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 9242dc91d751..9019ff5905b1 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c

@@ -54,7 +54,6 @@ void __init mem_init(void)
 	memblock_free_all();
 	max_low_pfn = totalram_pages();
 	max_pfn = max_low_pfn;
-	mem_init_print_info(NULL);
 	kmalloc_ok = 1;
 }

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index da31c2635ee4..21ffb03f6c72 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c

@@ -755,8 +755,6 @@ void __init mem_init(void)
 	after_bootmem = 1;
 	x86_init.hyper.init_after_bootmem();
 
-	mem_init_print_info(NULL);
-
 	/*
 	 * Check boundaries twice: Some fundamental inconsistencies can
 	 * be detected at build time already.

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 5430c81eefc9..aa8387aab9c1 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c

@@ -1350,8 +1350,6 @@ void __init mem_init(void)
 		kclist_add(&kcore_vsyscall, (void *)VSYSCALL_ADDR, PAGE_SIZE, KCORE_USER);
 
 	preallocate_vmalloc_pages();
-
-	mem_init_print_info(NULL);
 }
 
 #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT

diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 2daeba9e454e..6a32b2cf2718 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c

@@ -119,7 +119,6 @@ void __init mem_init(void)
 
 	memblock_free_all();
 
-	mem_init_print_info(NULL);
 	pr_info("virtual kernel memory layout:\n"
 #ifdef CONFIG_KASAN
 		"    kasan   : 0x%08lx - 0x%08lx  (%5lu MB)\n"

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 89314651dd62..c2e0b3495c5a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h

@@ -2373,7 +2373,7 @@ extern unsigned long free_reserved_area(void *start, void *end,
 					int poison, const char *s);
 
 extern void adjust_managed_page_count(struct page *page, long count);
-extern void mem_init_print_info(const char *str);
+extern void mem_init_print_info(void);
 
 extern void reserve_bootmem_region(phys_addr_t start, phys_addr_t end);

diff --git a/init/main.c b/init/main.c
index 53b278845b88..5581af5b4cb7 100644
--- a/init/main.c
+++ b/init/main.c

@@ -830,6 +830,7 @@ static void __init mm_init(void)
 	report_meminit();
 	stack_depot_init();
 	mem_init();
+	mem_init_print_info();
 	/* page_owner must be initialized after buddy is ready */
 	page_ext_init_flatmem_late();
 	kmem_cache_init();

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 55d938297ce6..b5fe5962837c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c

@@ -7728,7 +7728,7 @@ unsigned long free_reserved_area(void *start, void *end, int poison, const char
 	return pages;
 }
 
-void __init mem_init_print_info(const char *str)
+void __init mem_init_print_info(void)
 {
 	unsigned long physpages, codesize, datasize, rosize, bss_size;
 	unsigned long init_code_size, init_data_size;

@@ -7767,17 +7767,17 @@ void __init mem_init_print_info(const char *str)
 #ifdef	CONFIG_HIGHMEM
 		", %luK highmem"
 #endif
-		"%s%s)\n",
+		")\n",
 		nr_free_pages() << (PAGE_SHIFT - 10),
 		physpages << (PAGE_SHIFT - 10),
 		codesize >> 10, datasize >> 10, rosize >> 10,
 		(init_data_size + init_code_size) >> 10, bss_size >> 10,
 		(physpages - totalram_pages() - totalcma_pages) << (PAGE_SHIFT - 10),
-		totalcma_pages << (PAGE_SHIFT - 10),
+		totalcma_pages << (PAGE_SHIFT - 10)
 #ifdef	CONFIG_HIGHMEM
-		totalhigh_pages() << (PAGE_SHIFT - 10),
+		, totalhigh_pages() << (PAGE_SHIFT - 10)
 #endif
-		str ? ", " : "", str ? str : "");
+		);
 }
 
 /**

-- 
2.26.2

Re: [PATCH v2] mm: Move mem_init_print_info() into mm_init()

From: Christophe Leroy <hidden>
Date: 2021-03-17 05:49:19


Le 17/03/2021 à 02:52, Kefeng Wang a écrit :

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Kefeng Wang <redacted>
---
v2:
- Cleanup 'str' line suggested by Christophe and ACK

  arch/alpha/mm/init.c             |  1 -
  arch/arc/mm/init.c               |  1 -
  arch/arm/mm/init.c               |  2 --
  arch/arm64/mm/init.c             |  2 --
  arch/csky/mm/init.c              |  1 -
  arch/h8300/mm/init.c             |  2 --
  arch/hexagon/mm/init.c           |  1 -
  arch/ia64/mm/init.c              |  1 -
  arch/m68k/mm/init.c              |  1 -
  arch/microblaze/mm/init.c        |  1 -
  arch/mips/loongson64/numa.c      |  1 -
  arch/mips/mm/init.c              |  1 -
  arch/mips/sgi-ip27/ip27-memory.c |  1 -
  arch/nds32/mm/init.c             |  1 -
  arch/nios2/mm/init.c             |  1 -
  arch/openrisc/mm/init.c          |  2 --
  arch/parisc/mm/init.c            |  2 --
  arch/powerpc/mm/mem.c            |  1 -
  arch/riscv/mm/init.c             |  1 -
  arch/s390/mm/init.c              |  2 --
  arch/sh/mm/init.c                |  1 -
  arch/sparc/mm/init_32.c          |  2 --
  arch/sparc/mm/init_64.c          |  1 -
  arch/um/kernel/mem.c             |  1 -
  arch/x86/mm/init_32.c            |  2 --
  arch/x86/mm/init_64.c            |  2 --
  arch/xtensa/mm/init.c            |  1 -
  include/linux/mm.h               |  2 +-
  init/main.c                      |  1 +
  mm/page_alloc.c                  | 10 +++++-----
  30 files changed, 7 insertions(+), 42 deletions(-)

quoted hunk

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 89314651dd62..c2e0b3495c5a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h

@@ -2373,7 +2373,7 @@ extern unsigned long free_reserved_area(void *start, void *end,
  					int poison, const char *s);
  
  extern void adjust_managed_page_count(struct page *page, long count);
-extern void mem_init_print_info(const char *str);
+extern void mem_init_print_info(void);

Sorry I didn't see that in previous patch.

'extern' keyword is pointless for function prototypes and is deprecated, you should remove it.

That said,

Reviewed-by: Christophe Leroy <redacted> # focussed on powerpc

  
  extern void reserve_bootmem_region(phys_addr_t start, phys_addr_t end);

Re: [PATCH v2] mm: Move mem_init_print_info() into mm_init()

From: Kefeng Wang <hidden>
Date: 2021-03-17 05:59:01

On 2021/3/17 13:48, Christophe Leroy wrote:


Le 17/03/2021 à 02:52, Kefeng Wang a écrit :

quoted

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into 
mm_init().

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Kefeng Wang <redacted>
---
v2:
- Cleanup 'str' line suggested by Christophe and ACK

  arch/alpha/mm/init.c             |  1 -
  arch/arc/mm/init.c               |  1 -
  arch/arm/mm/init.c               |  2 --
  arch/arm64/mm/init.c             |  2 --
  arch/csky/mm/init.c              |  1 -
  arch/h8300/mm/init.c             |  2 --
  arch/hexagon/mm/init.c           |  1 -
  arch/ia64/mm/init.c              |  1 -
  arch/m68k/mm/init.c              |  1 -
  arch/microblaze/mm/init.c        |  1 -
  arch/mips/loongson64/numa.c      |  1 -
  arch/mips/mm/init.c              |  1 -
  arch/mips/sgi-ip27/ip27-memory.c |  1 -
  arch/nds32/mm/init.c             |  1 -
  arch/nios2/mm/init.c             |  1 -
  arch/openrisc/mm/init.c          |  2 --
  arch/parisc/mm/init.c            |  2 --
  arch/powerpc/mm/mem.c            |  1 -
  arch/riscv/mm/init.c             |  1 -
  arch/s390/mm/init.c              |  2 --
  arch/sh/mm/init.c                |  1 -
  arch/sparc/mm/init_32.c          |  2 --
  arch/sparc/mm/init_64.c          |  1 -
  arch/um/kernel/mem.c             |  1 -
  arch/x86/mm/init_32.c            |  2 --
  arch/x86/mm/init_64.c            |  2 --
  arch/xtensa/mm/init.c            |  1 -
  include/linux/mm.h               |  2 +-
  init/main.c                      |  1 +
  mm/page_alloc.c                  | 10 +++++-----
  30 files changed, 7 insertions(+), 42 deletions(-)

quoted

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 89314651dd62..c2e0b3495c5a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h

@@ -2373,7 +2373,7 @@ extern unsigned long free_reserved_area(void

*start, void *end,
                      int poison, const char *s);
    extern void adjust_managed_page_count(struct page *page, long 
count);
-extern void mem_init_print_info(const char *str);
+extern void mem_init_print_info(void);

Sorry I didn't see that in previous patch.

'extern' keyword is pointless for function prototypes and is 
deprecated, you should remove it.

That said,

Reviewed-by: Christophe Leroy <redacted> # focussed on 
powerpc

Thanks, let's wait for more feedback from other architectures, if 
necessary,  will send a new one.

quoted

    extern void reserve_bootmem_region(phys_addr_t start, phys_addr_t 
end);

Re: [PATCH v2] mm: Move mem_init_print_info() into mm_init()

From: David Hildenbrand <hidden>
Date: 2021-03-17 11:32:40

On 17.03.21 02:52, Kefeng Wang wrote:

quoted hunk

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Kefeng Wang <redacted>
---
v2:
- Cleanup 'str' line suggested by Christophe and ACK

  arch/alpha/mm/init.c             |  1 -
  arch/arc/mm/init.c               |  1 -
  arch/arm/mm/init.c               |  2 --
  arch/arm64/mm/init.c             |  2 --
  arch/csky/mm/init.c              |  1 -
  arch/h8300/mm/init.c             |  2 --
  arch/hexagon/mm/init.c           |  1 -
  arch/ia64/mm/init.c              |  1 -
  arch/m68k/mm/init.c              |  1 -
  arch/microblaze/mm/init.c        |  1 -
  arch/mips/loongson64/numa.c      |  1 -
  arch/mips/mm/init.c              |  1 -
  arch/mips/sgi-ip27/ip27-memory.c |  1 -
  arch/nds32/mm/init.c             |  1 -
  arch/nios2/mm/init.c             |  1 -
  arch/openrisc/mm/init.c          |  2 --
  arch/parisc/mm/init.c            |  2 --
  arch/powerpc/mm/mem.c            |  1 -
  arch/riscv/mm/init.c             |  1 -
  arch/s390/mm/init.c              |  2 --
  arch/sh/mm/init.c                |  1 -
  arch/sparc/mm/init_32.c          |  2 --
  arch/sparc/mm/init_64.c          |  1 -
  arch/um/kernel/mem.c             |  1 -
  arch/x86/mm/init_32.c            |  2 --
  arch/x86/mm/init_64.c            |  2 --
  arch/xtensa/mm/init.c            |  1 -
  include/linux/mm.h               |  2 +-
  init/main.c                      |  1 +
  mm/page_alloc.c                  | 10 +++++-----
  30 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 3c42b3147fd6..a97650a618f1 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c

@@ -282,5 +282,4 @@ mem_init(void)
  	set_max_mapnr(max_low_pfn);
  	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
  	memblock_free_all();
-	mem_init_print_info(NULL);
  }

diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index ce07e697916c..33832e36bdb7 100644
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c

@@ -194,7 +194,6 @@ void __init mem_init(void)
  {
  	memblock_free_all();
  	highmem_init();
-	mem_init_print_info(NULL);
  }
  
  #ifdef CONFIG_HIGHMEM

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 828a2561b229..7022b7b5c400 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c

@@ -316,8 +316,6 @@ void __init mem_init(void)
  
  	free_highpages();
  
-	mem_init_print_info(NULL);
-
  	/*
  	 * Check boundaries twice: Some fundamental inconsistencies can
  	 * be detected at build time already.

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 3685e12aba9b..e8f29a0bb2f1 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c

@@ -491,8 +491,6 @@ void __init mem_init(void)
  	/* this will put all unused low memory onto the freelists */
  	memblock_free_all();
  
-	mem_init_print_info(NULL);
-
  	/*
  	 * Check boundaries twice: Some fundamental inconsistencies can be
  	 * detected at build time already.

diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c
index 894050a8ce09..bf2004aa811a 100644
--- a/arch/csky/mm/init.c
+++ b/arch/csky/mm/init.c

@@ -107,7 +107,6 @@ void __init mem_init(void)
  			free_highmem_page(page);
  	}
  #endif
-	mem_init_print_info(NULL);
  }
  
  void free_initmem(void)

diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c
index 1f3b345d68b9..f7bf4693e3b2 100644
--- a/arch/h8300/mm/init.c
+++ b/arch/h8300/mm/init.c

@@ -98,6 +98,4 @@ void __init mem_init(void)
  
  	/* this will put all low memory onto the freelists */
  	memblock_free_all();
-
-	mem_init_print_info(NULL);
  }

diff --git a/arch/hexagon/mm/init.c b/arch/hexagon/mm/init.c
index f2e6c868e477..f01e91e10d95 100644
--- a/arch/hexagon/mm/init.c
+++ b/arch/hexagon/mm/init.c

@@ -55,7 +55,6 @@ void __init mem_init(void)
  {
  	/*  No idea where this is actually declared.  Seems to evade LXR.  */
  	memblock_free_all();
-	mem_init_print_info(NULL);
  
  	/*
  	 *  To-Do:  someone somewhere should wipe out the bootmem map

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 16d0d7d22657..83280e2df807 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c

@@ -659,7 +659,6 @@ mem_init (void)
  	set_max_mapnr(max_low_pfn);
  	high_memory = __va(max_low_pfn * PAGE_SIZE);
  	memblock_free_all();
-	mem_init_print_info(NULL);
  
  	/*
  	 * For fsyscall entrpoints with no light-weight handler, use the ordinary

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 14c1e541451c..1759ab875d47 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c

@@ -153,5 +153,4 @@ void __init mem_init(void)
  	/* this will put all memory onto the freelists */
  	memblock_free_all();
  	init_pointer_tables();
-	mem_init_print_info(NULL);
  }

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 05cf1fb3f5ff..ab55c70380a5 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c

@@ -131,7 +131,6 @@ void __init mem_init(void)
  	highmem_setup();
  #endif
  
-	mem_init_print_info(NULL);
  	mem_init_done = 1;
  }

diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c
index 8315c871c435..fa9b4a487a47 100644
--- a/arch/mips/loongson64/numa.c
+++ b/arch/mips/loongson64/numa.c

@@ -178,7 +178,6 @@ void __init mem_init(void)
  	high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
  	memblock_free_all();
  	setup_zero_pages();	/* This comes from node 0 */
-	mem_init_print_info(NULL);
  }
  
  /* All PCI device belongs to logical Node-0 */

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 5cb73bf74a8b..c36358758969 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c

@@ -467,7 +467,6 @@ void __init mem_init(void)
  	memblock_free_all();
  	setup_zero_pages();	/* Setup zeroed pages.  */
  	mem_init_free_highmem();
-	mem_init_print_info(NULL);
  
  #ifdef CONFIG_64BIT
  	if ((unsigned long) &_text > (unsigned long) CKSEG0)

diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 87bb6945ec25..6173684b5aaa 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c

@@ -420,5 +420,4 @@ void __init mem_init(void)
  	high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
  	memblock_free_all();
  	setup_zero_pages();	/* This comes from node 0 */
-	mem_init_print_info(NULL);
  }

diff --git a/arch/nds32/mm/init.c b/arch/nds32/mm/init.c
index fa86f7b2f416..f63f839738c4 100644
--- a/arch/nds32/mm/init.c
+++ b/arch/nds32/mm/init.c

@@ -191,7 +191,6 @@ void __init mem_init(void)
  
  	/* this will put all low memory onto the freelists */
  	memblock_free_all();
-	mem_init_print_info(NULL);
  
  	pr_info("virtual kernel memory layout:\n"
  		"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"

diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c
index 61862dbb0e32..613fcaa5988a 100644
--- a/arch/nios2/mm/init.c
+++ b/arch/nios2/mm/init.c

@@ -71,7 +71,6 @@ void __init mem_init(void)
  
  	/* this will put all memory onto the freelists */
  	memblock_free_all();
-	mem_init_print_info(NULL);
  }
  
  void __init mmu_init(void)

diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c
index bf9b2310fc93..d5641198b90c 100644
--- a/arch/openrisc/mm/init.c
+++ b/arch/openrisc/mm/init.c

@@ -211,8 +211,6 @@ void __init mem_init(void)
  	/* this will put all low memory onto the freelists */
  	memblock_free_all();
  
-	mem_init_print_info(NULL);
-
  	printk("mem_init_done ...........................................\n");
  	mem_init_done = 1;
  	return;

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 9ca4e4ff6895..591a4e939415 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c

@@ -573,8 +573,6 @@ void __init mem_init(void)
  #endif
  		parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START);
  
-	mem_init_print_info(NULL);
-
  #if 0
  	/*
  	 * Do not expose the virtual kernel memory layout to userspace.

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 4e8ce6d85232..7e11c4cb08b8 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c

@@ -312,7 +312,6 @@ void __init mem_init(void)
  		(mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) - 1;
  #endif
  
-	mem_init_print_info(NULL);
  #ifdef CONFIG_PPC32
  	pr_info("Kernel virtual memory layout:\n");
  #ifdef CONFIG_KASAN

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 7f5036fbee8c..3c5ee3b7d811 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c

@@ -102,7 +102,6 @@ void __init mem_init(void)
  	high_memory = (void *)(__va(PFN_PHYS(max_low_pfn)));
  	memblock_free_all();
  
-	mem_init_print_info(NULL);
  	print_vm_layout();
  }

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 0e76b2127dc6..8ac710de1ab1 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c

@@ -209,8 +209,6 @@ void __init mem_init(void)
  	setup_zero_pages();	/* Setup zeroed pages. */
  
  	cmma_init_nodat();
-
-	mem_init_print_info(NULL);
  }
  
  void free_initmem(void)

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 0db6919af8d3..168d7d4dd735 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c

@@ -359,7 +359,6 @@ void __init mem_init(void)
  
  	vsyscall_init();
  
-	mem_init_print_info(NULL);
  	pr_info("virtual kernel memory layout:\n"
  		"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"
  		"    vmalloc : 0x%08lx - 0x%08lx   (%4ld MB)\n"

diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index 6139c5700ccc..1e9f577f084d 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c

@@ -292,8 +292,6 @@ void __init mem_init(void)
  
  		map_high_region(start_pfn, end_pfn);
  	}
-
-	mem_init_print_info(NULL);
  }
  
  void sparc_flush_page_to_ram(struct page *page)

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 182bb7bdaa0a..e454f179cf5d 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c

@@ -2520,7 +2520,6 @@ void __init mem_init(void)
  	}
  	mark_page_reserved(mem_map_zero);
  
-	mem_init_print_info(NULL);
  
  	if (tlb_type == cheetah || tlb_type == cheetah_plus)
  		cheetah_ecache_flush_init();

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 9242dc91d751..9019ff5905b1 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c

@@ -54,7 +54,6 @@ void __init mem_init(void)
  	memblock_free_all();
  	max_low_pfn = totalram_pages();
  	max_pfn = max_low_pfn;
-	mem_init_print_info(NULL);
  	kmalloc_ok = 1;
  }

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index da31c2635ee4..21ffb03f6c72 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c

@@ -755,8 +755,6 @@ void __init mem_init(void)
  	after_bootmem = 1;
  	x86_init.hyper.init_after_bootmem();
  
-	mem_init_print_info(NULL);
-
  	/*
  	 * Check boundaries twice: Some fundamental inconsistencies can
  	 * be detected at build time already.

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 5430c81eefc9..aa8387aab9c1 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c

@@ -1350,8 +1350,6 @@ void __init mem_init(void)
  		kclist_add(&kcore_vsyscall, (void *)VSYSCALL_ADDR, PAGE_SIZE, KCORE_USER);
  
  	preallocate_vmalloc_pages();
-
-	mem_init_print_info(NULL);
  }
  
  #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT

diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 2daeba9e454e..6a32b2cf2718 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c

@@ -119,7 +119,6 @@ void __init mem_init(void)
  
  	memblock_free_all();
  
-	mem_init_print_info(NULL);
  	pr_info("virtual kernel memory layout:\n"
  #ifdef CONFIG_KASAN
  		"    kasan   : 0x%08lx - 0x%08lx  (%5lu MB)\n"

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 89314651dd62..c2e0b3495c5a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h

@@ -2373,7 +2373,7 @@ extern unsigned long free_reserved_area(void *start, void *end,
  					int poison, const char *s);
  
  extern void adjust_managed_page_count(struct page *page, long count);
-extern void mem_init_print_info(const char *str);
+extern void mem_init_print_info(void);
  
  extern void reserve_bootmem_region(phys_addr_t start, phys_addr_t end);

diff --git a/init/main.c b/init/main.c
index 53b278845b88..5581af5b4cb7 100644
--- a/init/main.c
+++ b/init/main.c

@@ -830,6 +830,7 @@ static void __init mm_init(void)
  	report_meminit();
  	stack_depot_init();
  	mem_init();
+	mem_init_print_info();
  	/* page_owner must be initialized after buddy is ready */
  	page_ext_init_flatmem_late();
  	kmem_cache_init();

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 55d938297ce6..b5fe5962837c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c

@@ -7728,7 +7728,7 @@ unsigned long free_reserved_area(void *start, void *end, int poison, const char
  	return pages;
  }
  
-void __init mem_init_print_info(const char *str)
+void __init mem_init_print_info(void)
  {
  	unsigned long physpages, codesize, datasize, rosize, bss_size;
  	unsigned long init_code_size, init_data_size;

@@ -7767,17 +7767,17 @@ void __init mem_init_print_info(const char *str)
  #ifdef	CONFIG_HIGHMEM
  		", %luK highmem"
  #endif
-		"%s%s)\n",
+		")\n",
  		nr_free_pages() << (PAGE_SHIFT - 10),
  		physpages << (PAGE_SHIFT - 10),
  		codesize >> 10, datasize >> 10, rosize >> 10,
  		(init_data_size + init_code_size) >> 10, bss_size >> 10,
  		(physpages - totalram_pages() - totalcma_pages) << (PAGE_SHIFT - 10),
-		totalcma_pages << (PAGE_SHIFT - 10),
+		totalcma_pages << (PAGE_SHIFT - 10)
  #ifdef	CONFIG_HIGHMEM
-		totalhigh_pages() << (PAGE_SHIFT - 10),
+		, totalhigh_pages() << (PAGE_SHIFT - 10)
  #endif
-		str ? ", " : "", str ? str : "");
+		);
  }
  
  /**

As I had roughly the same patch laying around here when playing with 
adjustments of the managed page counters

Acked-by: David Hildenbrand <redacted>

-- 
Thanks,

David / dhildenb

Re: [PATCH v2] mm: Move mem_init_print_info() into mm_init()

From: Anatoly Pugachev <hidden>
Date: 2021-03-17 14:04:33

On Wed, Mar 17, 2021 at 4:51 AM Kefeng Wang [off-list ref] wrote:

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Kefeng Wang <redacted>
---
v2:
- Cleanup 'str' line suggested by Christophe and ACK

applied patch (5.12.0-rc3-00020-g1df27313f50a-dirty) over linus.git
and tested boot on a sparc64 virtual machine (ldom) - boots.

Re: [PATCH v2] mm: Move mem_init_print_info() into mm_init()

From: Dave Hansen <hidden>
Date: 2021-03-17 18:49:25

On 3/16/21 6:52 PM, Kefeng Wang wrote:

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>

It's not a big deal but you might want to say something like:

Acked-by: Dave Hansen <dave.hansen@linux.intel.com> # x86 bits

Just to make it clear that I didn't look at the alpha bits at all. :)

Re: [PATCH v2] mm: Move mem_init_print_info() into mm_init()

From: Vineet Gupta <hidden>
Date: 2021-03-18 00:41:15

On 3/16/21 6:52 PM, Kefeng Wang wrote:

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Kefeng Wang <redacted>

Acked-by: Vineet Gupta <redacted>

Thx,
-Vineet

Re: [PATCH v2] mm: Move mem_init_print_info() into mm_init()

From: Kefeng Wang <hidden>
Date: 2021-03-18 01:03:10

On 2021/3/18 2:48, Dave Hansen wrote:

On 3/16/21 6:52 PM, Kefeng Wang wrote:

quoted

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>

It's not a big deal but you might want to say something like:

Acked-by: Dave Hansen <dave.hansen@linux.intel.com> # x86 bits

Just to make it clear that I didn't look at the alpha bits at all. :)

Get it, will be careful, thanks.

Re: [PATCH v2] mm: Move mem_init_print_info() into mm_init()

From: Kefeng Wang <hidden>
Date: 2021-03-30 13:11:42

Hi Andrew, kindly ping

On 2021/3/17 9:52, Kefeng Wang wrote:

quoted hunk

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Kefeng Wang <redacted>
---
v2:
- Cleanup 'str' line suggested by Christophe and ACK

  arch/alpha/mm/init.c             |  1 -
  arch/arc/mm/init.c               |  1 -
  arch/arm/mm/init.c               |  2 --
  arch/arm64/mm/init.c             |  2 --
  arch/csky/mm/init.c              |  1 -
  arch/h8300/mm/init.c             |  2 --
  arch/hexagon/mm/init.c           |  1 -
  arch/ia64/mm/init.c              |  1 -
  arch/m68k/mm/init.c              |  1 -
  arch/microblaze/mm/init.c        |  1 -
  arch/mips/loongson64/numa.c      |  1 -
  arch/mips/mm/init.c              |  1 -
  arch/mips/sgi-ip27/ip27-memory.c |  1 -
  arch/nds32/mm/init.c             |  1 -
  arch/nios2/mm/init.c             |  1 -
  arch/openrisc/mm/init.c          |  2 --
  arch/parisc/mm/init.c            |  2 --
  arch/powerpc/mm/mem.c            |  1 -
  arch/riscv/mm/init.c             |  1 -
  arch/s390/mm/init.c              |  2 --
  arch/sh/mm/init.c                |  1 -
  arch/sparc/mm/init_32.c          |  2 --
  arch/sparc/mm/init_64.c          |  1 -
  arch/um/kernel/mem.c             |  1 -
  arch/x86/mm/init_32.c            |  2 --
  arch/x86/mm/init_64.c            |  2 --
  arch/xtensa/mm/init.c            |  1 -
  include/linux/mm.h               |  2 +-
  init/main.c                      |  1 +
  mm/page_alloc.c                  | 10 +++++-----
  30 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 3c42b3147fd6..a97650a618f1 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c

@@ -282,5 +282,4 @@ mem_init(void)
  	set_max_mapnr(max_low_pfn);
  	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
  	memblock_free_all();
-	mem_init_print_info(NULL);
  }

diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index ce07e697916c..33832e36bdb7 100644
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c

@@ -194,7 +194,6 @@ void __init mem_init(void)
  {
  	memblock_free_all();
  	highmem_init();
-	mem_init_print_info(NULL);
  }
  
  #ifdef CONFIG_HIGHMEM

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 828a2561b229..7022b7b5c400 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c

@@ -316,8 +316,6 @@ void __init mem_init(void)
  
  	free_highpages();
  
-	mem_init_print_info(NULL);
-
  	/*
  	 * Check boundaries twice: Some fundamental inconsistencies can
  	 * be detected at build time already.

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 3685e12aba9b..e8f29a0bb2f1 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c

@@ -491,8 +491,6 @@ void __init mem_init(void)
  	/* this will put all unused low memory onto the freelists */
  	memblock_free_all();
  
-	mem_init_print_info(NULL);
-
  	/*
  	 * Check boundaries twice: Some fundamental inconsistencies can be
  	 * detected at build time already.

diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c
index 894050a8ce09..bf2004aa811a 100644
--- a/arch/csky/mm/init.c
+++ b/arch/csky/mm/init.c

@@ -107,7 +107,6 @@ void __init mem_init(void)
  			free_highmem_page(page);
  	}
  #endif
-	mem_init_print_info(NULL);
  }
  
  void free_initmem(void)

diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c
index 1f3b345d68b9..f7bf4693e3b2 100644
--- a/arch/h8300/mm/init.c
+++ b/arch/h8300/mm/init.c

@@ -98,6 +98,4 @@ void __init mem_init(void)
  
  	/* this will put all low memory onto the freelists */
  	memblock_free_all();
-
-	mem_init_print_info(NULL);
  }

diff --git a/arch/hexagon/mm/init.c b/arch/hexagon/mm/init.c
index f2e6c868e477..f01e91e10d95 100644
--- a/arch/hexagon/mm/init.c
+++ b/arch/hexagon/mm/init.c

@@ -55,7 +55,6 @@ void __init mem_init(void)
  {
  	/*  No idea where this is actually declared.  Seems to evade LXR.  */
  	memblock_free_all();
-	mem_init_print_info(NULL);
  
  	/*
  	 *  To-Do:  someone somewhere should wipe out the bootmem map

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 16d0d7d22657..83280e2df807 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c

@@ -659,7 +659,6 @@ mem_init (void)
  	set_max_mapnr(max_low_pfn);
  	high_memory = __va(max_low_pfn * PAGE_SIZE);
  	memblock_free_all();
-	mem_init_print_info(NULL);
  
  	/*
  	 * For fsyscall entrpoints with no light-weight handler, use the ordinary

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 14c1e541451c..1759ab875d47 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c

@@ -153,5 +153,4 @@ void __init mem_init(void)
  	/* this will put all memory onto the freelists */
  	memblock_free_all();
  	init_pointer_tables();
-	mem_init_print_info(NULL);
  }

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 05cf1fb3f5ff..ab55c70380a5 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c

@@ -131,7 +131,6 @@ void __init mem_init(void)
  	highmem_setup();
  #endif
  
-	mem_init_print_info(NULL);
  	mem_init_done = 1;
  }

diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c
index 8315c871c435..fa9b4a487a47 100644
--- a/arch/mips/loongson64/numa.c
+++ b/arch/mips/loongson64/numa.c

@@ -178,7 +178,6 @@ void __init mem_init(void)
  	high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
  	memblock_free_all();
  	setup_zero_pages();	/* This comes from node 0 */
-	mem_init_print_info(NULL);
  }
  
  /* All PCI device belongs to logical Node-0 */

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 5cb73bf74a8b..c36358758969 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c

@@ -467,7 +467,6 @@ void __init mem_init(void)
  	memblock_free_all();
  	setup_zero_pages();	/* Setup zeroed pages.  */
  	mem_init_free_highmem();
-	mem_init_print_info(NULL);
  
  #ifdef CONFIG_64BIT
  	if ((unsigned long) &_text > (unsigned long) CKSEG0)

diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 87bb6945ec25..6173684b5aaa 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c

@@ -420,5 +420,4 @@ void __init mem_init(void)
  	high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
  	memblock_free_all();
  	setup_zero_pages();	/* This comes from node 0 */
-	mem_init_print_info(NULL);
  }

diff --git a/arch/nds32/mm/init.c b/arch/nds32/mm/init.c
index fa86f7b2f416..f63f839738c4 100644
--- a/arch/nds32/mm/init.c
+++ b/arch/nds32/mm/init.c

@@ -191,7 +191,6 @@ void __init mem_init(void)
  
  	/* this will put all low memory onto the freelists */
  	memblock_free_all();
-	mem_init_print_info(NULL);
  
  	pr_info("virtual kernel memory layout:\n"
  		"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"

diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c
index 61862dbb0e32..613fcaa5988a 100644
--- a/arch/nios2/mm/init.c
+++ b/arch/nios2/mm/init.c

@@ -71,7 +71,6 @@ void __init mem_init(void)
  
  	/* this will put all memory onto the freelists */
  	memblock_free_all();
-	mem_init_print_info(NULL);
  }
  
  void __init mmu_init(void)

diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c
index bf9b2310fc93..d5641198b90c 100644
--- a/arch/openrisc/mm/init.c
+++ b/arch/openrisc/mm/init.c

@@ -211,8 +211,6 @@ void __init mem_init(void)
  	/* this will put all low memory onto the freelists */
  	memblock_free_all();
  
-	mem_init_print_info(NULL);
-
  	printk("mem_init_done ...........................................\n");
  	mem_init_done = 1;
  	return;

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 9ca4e4ff6895..591a4e939415 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c

@@ -573,8 +573,6 @@ void __init mem_init(void)
  #endif
  		parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START);
  
-	mem_init_print_info(NULL);
-
  #if 0
  	/*
  	 * Do not expose the virtual kernel memory layout to userspace.

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 4e8ce6d85232..7e11c4cb08b8 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c

@@ -312,7 +312,6 @@ void __init mem_init(void)
  		(mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) - 1;
  #endif
  
-	mem_init_print_info(NULL);
  #ifdef CONFIG_PPC32
  	pr_info("Kernel virtual memory layout:\n");
  #ifdef CONFIG_KASAN

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 7f5036fbee8c..3c5ee3b7d811 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c

@@ -102,7 +102,6 @@ void __init mem_init(void)
  	high_memory = (void *)(__va(PFN_PHYS(max_low_pfn)));
  	memblock_free_all();
  
-	mem_init_print_info(NULL);
  	print_vm_layout();
  }

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 0e76b2127dc6..8ac710de1ab1 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c

@@ -209,8 +209,6 @@ void __init mem_init(void)
  	setup_zero_pages();	/* Setup zeroed pages. */
  
  	cmma_init_nodat();
-
-	mem_init_print_info(NULL);
  }
  
  void free_initmem(void)

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 0db6919af8d3..168d7d4dd735 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c

@@ -359,7 +359,6 @@ void __init mem_init(void)
  
  	vsyscall_init();
  
-	mem_init_print_info(NULL);
  	pr_info("virtual kernel memory layout:\n"
  		"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"
  		"    vmalloc : 0x%08lx - 0x%08lx   (%4ld MB)\n"

diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index 6139c5700ccc..1e9f577f084d 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c

@@ -292,8 +292,6 @@ void __init mem_init(void)
  
  		map_high_region(start_pfn, end_pfn);
  	}
-
-	mem_init_print_info(NULL);
  }
  
  void sparc_flush_page_to_ram(struct page *page)

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 182bb7bdaa0a..e454f179cf5d 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c

@@ -2520,7 +2520,6 @@ void __init mem_init(void)
  	}
  	mark_page_reserved(mem_map_zero);
  
-	mem_init_print_info(NULL);
  
  	if (tlb_type == cheetah || tlb_type == cheetah_plus)
  		cheetah_ecache_flush_init();

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 9242dc91d751..9019ff5905b1 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c

@@ -54,7 +54,6 @@ void __init mem_init(void)
  	memblock_free_all();
  	max_low_pfn = totalram_pages();
  	max_pfn = max_low_pfn;
-	mem_init_print_info(NULL);
  	kmalloc_ok = 1;
  }

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index da31c2635ee4..21ffb03f6c72 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c

@@ -755,8 +755,6 @@ void __init mem_init(void)
  	after_bootmem = 1;
  	x86_init.hyper.init_after_bootmem();
  
-	mem_init_print_info(NULL);
-
  	/*
  	 * Check boundaries twice: Some fundamental inconsistencies can
  	 * be detected at build time already.

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 5430c81eefc9..aa8387aab9c1 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c

@@ -1350,8 +1350,6 @@ void __init mem_init(void)
  		kclist_add(&kcore_vsyscall, (void *)VSYSCALL_ADDR, PAGE_SIZE, KCORE_USER);
  
  	preallocate_vmalloc_pages();
-
-	mem_init_print_info(NULL);
  }
  
  #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT

diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 2daeba9e454e..6a32b2cf2718 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c

@@ -119,7 +119,6 @@ void __init mem_init(void)
  
  	memblock_free_all();
  
-	mem_init_print_info(NULL);
  	pr_info("virtual kernel memory layout:\n"
  #ifdef CONFIG_KASAN
  		"    kasan   : 0x%08lx - 0x%08lx  (%5lu MB)\n"

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 89314651dd62..c2e0b3495c5a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h

@@ -2373,7 +2373,7 @@ extern unsigned long free_reserved_area(void *start, void *end,
  					int poison, const char *s);
  
  extern void adjust_managed_page_count(struct page *page, long count);
-extern void mem_init_print_info(const char *str);
+extern void mem_init_print_info(void);
  
  extern void reserve_bootmem_region(phys_addr_t start, phys_addr_t end);

diff --git a/init/main.c b/init/main.c
index 53b278845b88..5581af5b4cb7 100644
--- a/init/main.c
+++ b/init/main.c

@@ -830,6 +830,7 @@ static void __init mm_init(void)
  	report_meminit();
  	stack_depot_init();
  	mem_init();
+	mem_init_print_info();
  	/* page_owner must be initialized after buddy is ready */
  	page_ext_init_flatmem_late();
  	kmem_cache_init();

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 55d938297ce6..b5fe5962837c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c

@@ -7728,7 +7728,7 @@ unsigned long free_reserved_area(void *start, void *end, int poison, const char
  	return pages;
  }
  
-void __init mem_init_print_info(const char *str)
+void __init mem_init_print_info(void)
  {
  	unsigned long physpages, codesize, datasize, rosize, bss_size;
  	unsigned long init_code_size, init_data_size;

@@ -7767,17 +7767,17 @@ void __init mem_init_print_info(const char *str)
  #ifdef	CONFIG_HIGHMEM
  		", %luK highmem"
  #endif
-		"%s%s)\n",
+		")\n",
  		nr_free_pages() << (PAGE_SHIFT - 10),
  		physpages << (PAGE_SHIFT - 10),
  		codesize >> 10, datasize >> 10, rosize >> 10,
  		(init_data_size + init_code_size) >> 10, bss_size >> 10,
  		(physpages - totalram_pages() - totalcma_pages) << (PAGE_SHIFT - 10),
-		totalcma_pages << (PAGE_SHIFT - 10),
+		totalcma_pages << (PAGE_SHIFT - 10)
  #ifdef	CONFIG_HIGHMEM
-		totalhigh_pages() << (PAGE_SHIFT - 10),
+		, totalhigh_pages() << (PAGE_SHIFT - 10)
  #endif
-		str ? ", " : "", str ? str : "");
+		);
  }
  
  /**

Re: [PATCH v2] mm: Move mem_init_print_info() into mm_init()

From: Mike Rapoport <rppt@kernel.org>
Date: 2021-03-31 09:30:07

On Wed, Mar 17, 2021 at 09:52:10AM +0800, Kefeng Wang wrote:

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Kefeng Wang <redacted>

Acked-by: Mike Rapoport <redacted>

---
v2:
- Cleanup 'str' line suggested by Christophe and ACK

Re: [PATCH v2] mm: Move mem_init_print_info() into mm_init()

From: Russell King - ARM Linux admin <linux@armlinux.org.uk>
Date: 2021-03-31 09:36:01

On Wed, Mar 17, 2021 at 09:52:10AM +0800, Kefeng Wang wrote:

mem_init_print_info() is called in mem_init() on each architecture,
and pass NULL argument, so using void argument and move it into mm_init().

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Kefeng Wang <redacted>

Acked-by: Russell King <redacted> # for arm bits
-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help