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 3c42b3147fd6f00168609b243805f87c5099e921..a97650a618f1b6d8ccecedd3b239bd620ba6fb14 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 ce07e697916c8f86bc2d83649cb5cbed0bc2f66b..33832e36bdb7d52f5cec6d12c2f2e2c790e0c569 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 828a2561b2295813cc304f18434ab8dae82ae74a..7022b7b5c400422c0e4df080ca62b040bce4c478 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 470f92e6a5426c43e5ebd6d0d821931fdcd43f1c..ef031511ce29fedf994b9f2be277768609d3642c 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 894050a8ce093b91bd6ba504f1d3065cf1308c84..bf2004aa811a0cad41de46ffa59b0de753616da1 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 1f3b345d68b97b9d71fb4276f6eab5c5294c6c66..f7bf4693e3b24d40a72f97d6aa42282f4f4efb0d 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 f2e6c868e477c8086f5bac6cca6fecfc5d5e7bc2..f01e91e10d95d258ca83079af5cb5ba3bf231a46 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 97a13eda81bfea5f860ffbec112f9e65587fa9dc..064a967a7b6e3cd46cccbd4af0b3829ddc06529c 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 14c1e541451cad3cf23620a05b59afd3825856d3..1759ab875d4728c8f7795d6c541cc1468aad1186 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 05cf1fb3f5ffa582e114b0f4abe8db48d32ead77..ab55c70380a5cc6be5f3807ff29ad5b28eae66d0 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 8315c871c4352dc2078d9d5388f112995eea6734..fa9b4a487a479d1e03ba7bd87f7d8f5079ac0b8c 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 5cb73bf74a8b6cd2327239ca047aab467d717137..c36358758969fa37d5b29da16e3f0db7d6c09697 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 87bb6945ec25dcf9419a6b282123437d87a722f4..6173684b5aaa04f881b0b72fce93c39ab026b856 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 fa86f7b2f4166d802bcd4569d9bce0a8d134477f..f63f839738c4603ca43d6f3a8e8084f2d757aec7 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 61862dbb0e326751a79986096bc3c439dd95f12e..613fcaa5988a9a8d0c63b5feda553ac77e6136bc 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 bf9b2310fc9364936bbbd460af851782d1094ec6..d5641198b90ce7b10c8fa1c7bc8d30e90a6b930c 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 9ca4e4ff689598eb18550ba836a634c107c03bc6..591a4e939415374c5234a9f747057175b84b7ace 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 4e8ce6d85232375c09fdf18b401cb19cdf858605..7e11c4cb08b89c7d65f315156ed1c8f91700fbcb 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 067583ab1bd7f2e4b8cbe0fbab9fdd47ee0d8e85..92e39cfa5227aeaf83b6340b4e1ad0083a1310ac 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 0e76b2127dc6b81b54d74613a07aefa086ea637b..8ac710de1ab1b81ee884f58458e792a00d9742b3 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 0db6919af8d32cdb62140d3b49173da8d8440030..168d7d4dd73598af15255ccf23386771aa003103 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 6139c5700ccc9cf2ac477af4e795b875b88b6f9f..1e9f577f084dafa31944cc0521d6b9b3c1d8a313 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 182bb7bdaa0a158be1c4b92f92502d4d15cd7385..e454f179cf5df5843aec927a32cc97b9484898e3 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 9242dc91d75193475cb105b4e6e6ab016f1a7a08..9019ff5905b13622ccdb12accdbf6345c483bcc7 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 da31c2635ee43792d5bf9d7902fce1f652887e20..21ffb03f6c727cfebd02723fbaa77588e934dc03 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 58ae2f746b3ee04a626f76d927e2a369dbd96105..e527d829e1ed78a4879a30f977723a509c163bd9 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 2daeba9e454ea8f34bad7499ad619289d53e1d69..6a32b2cf271856cfd4e12808a5e702db3c061d53 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 64b2e3a0b94df834b91d0225d981559e97812f40..011f43605807f82725d5cd343d32f5e33f2b9af6 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 ae96c79ad2d3b6695d7176b0fe932f28b9e5024b..dd11bfd10eadeaf9e607d23c6af85e490e62b233 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 6314de5387f5163fbe32cd557fae31953f62774c..b55073d0e84a3681d9b889641121dc83f1cc1acc 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 : "");
+               );
 }
 
 /**