mm: move mem_init_print_info() into mm_init()

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().

Link: https://lkml.kernel.org/r/20210317015210.33641-1-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>	[x86]
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>	[powerpc]
Acked-by: David Hildenbrand <david@redhat.com>
Tested-by: Anatoly Pugachev <matorola@gmail.com>	[sparc64]
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>	[arm]
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Guo Ren <guoren@kernel.org>
Cc: Yoshinori Sato <ysato@users.osdn.me>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: "Peter Zijlstra" <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 3c42b31..a97650a 100644 (file)
--- 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 ce07e69..33832e3 100644 (file)
--- 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 828a256..7022b7b 100644 (file)
--- 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 470f92e..ef03151 100644 (file)
--- 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 894050a..bf2004a 100644 (file)
--- 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 1f3b345..f7bf469 100644 (file)
--- 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 f2e6c86..f01e91e 100644 (file)
--- 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 97a13ed..064a967 100644 (file)
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -449,7 +449,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 14c1e54..1759ab8 100644 (file)
--- 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 05cf1fb..ab55c70 100644 (file)
--- 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 8315c87..fa9b4a4 100644 (file)
--- 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 5cb73bf..c363587 100644 (file)
--- 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 87bb694..6173684 100644 (file)
--- 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 fa86f7b..f63f839 100644 (file)
--- 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 61862db..613fcaa 100644 (file)
--- 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 bf9b231..d564119 100644 (file)
--- 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 9ca4e4f..591a4e9 100644 (file)
--- 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 4e8ce6d..7e11c4c 100644 (file)
--- 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 067583a..92e39cf 100644 (file)
--- 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 0e76b21..8ac710d 100644 (file)
--- 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 0db6919..168d7d4 100644 (file)
--- 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 6139c57..1e9f577 100644 (file)
--- 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 182bb7b..e454f17 100644 (file)
--- 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 9242dc9..9019ff5 100644 (file)
--- 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 da31c26..21ffb03 100644 (file)
--- 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 58ae2f7..e527d82 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1351,8 +1351,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 2daeba9..6a32b2c 100644 (file)
--- 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 64b2e3a..011f436 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2360,7 +2360,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 ae96c79..dd11bfd 100644 (file)
--- 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 6314de5..b55073d 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7734,7 +7734,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;
@@ -7773,17 +7773,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 : "");
+               );
 }
 
 /**