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

2021-03-16 Thread Kefeng Wang 
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 
---
 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.

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

2021-03-16 Thread Christophe Leroy 



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 
---
  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/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

___
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc

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

2021-03-16 Thread Kefeng Wang 


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



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 
---
  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/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
.



___
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc

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

2021-03-16 Thread Kefeng Wang 
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 
---

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/

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

2021-03-16 Thread Christophe Leroy 



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 
---

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/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)
  #ifdefCONFIG_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,
@@ -,7 +,7 @@ void __init mem_init_print_info(const char *str)
  #ifdefCONFIG_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

___
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc

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

2021-03-16 Thread Dave Hansen 
On 3/16/21 7:26 AM, Kefeng Wang wrote:
> 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 

___
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc

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

2021-03-16 Thread Kefeng Wang 
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 
Signed-off-by: Kefeng Wang 
---
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/i

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

2021-03-16 Thread Christophe Leroy 



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 
Signed-off-by: Kefeng Wang 
---
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/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  # focussed on powerpc

  
  extern void reserve_bootmem_region(phys_addr_t start, phys_addr_t end);
  


___
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc

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

2021-03-16 Thread Kefeng Wang 


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



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 
Signed-off-by: Kefeng Wang 
---
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/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  # focussed on 
powerpc
Thanks, let's wait for more feedback from other architectures, if 
necessary,  will send a new one.


    extern void reserve_bootmem_region(phys_addr_t start, phys_addr_t 
end);

.



___
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc