[folded-merged] mm-mm_init-use-nodes-number-of-cpus-in-deferred_page_init_max_threads-v3.patch removed from -mm tree

[folded-merged] mm-mm_init-use-nodes-number-of-cpus-in-deferred_page_init_max_threads-v3.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm-mm_init-use-nodes-number-of-cpus-in-deferred_page_init_max_threads-v3
has been removed from the -mm tree.  Its filename was
     mm-mm_init-use-nodes-number-of-cpus-in-deferred_page_init_max_threads-v3.patch

This patch was dropped because it was folded into mm-mm_init-use-nodes-number-of-cpus-in-deferred_page_init_max_threads.patch

------------------------------------------------------
From: Eric Chanudet <echanude@redhat.com>
Subject: mm-mm_init-use-nodes-number-of-cpus-in-deferred_page_init_max_threads-v3
Date: Tue, 28 May 2024 14:54:58 -0400

 - deferred_page_init_max_threads returns unsigned and use max instead
   of max_t.
 - Make deferred_page_init_max_threads static since there are no more
   override.

Link: https://lkml.kernel.org/r/20240528185455.643227-4-echanude@redhat.com
Signed-off-by: Eric Chanudet <echanude@redhat.com>
Tested-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Baoquan He <bhe@redhat.com>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/memblock.h |    2 --
 mm/mm_init.c             |    5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

--- a/include/linux/memblock.h~mm-mm_init-use-nodes-number-of-cpus-in-deferred_page_init_max_threads-v3
+++ a/include/linux/memblock.h
@@ -335,8 +335,6 @@ void __next_mem_pfn_range_in_zone(u64 *i
 	for (; i != U64_MAX;					  \
 	     __next_mem_pfn_range_in_zone(&i, zone, p_start, p_end))
 
-int __init deferred_page_init_max_threads(const struct cpumask *node_cpumask);
-
 #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */
 
 /**
--- a/mm/mm_init.c~mm-mm_init-use-nodes-number-of-cpus-in-deferred_page_init_max_threads-v3
+++ a/mm/mm_init.c
@@ -2122,11 +2122,10 @@ deferred_init_memmap_chunk(unsigned long
 	}
 }
 
-/* An arch may override for more concurrency. */
-__weak int __init
+static unsigned int __init
 deferred_page_init_max_threads(const struct cpumask *node_cpumask)
 {
-	return max_t(int, cpumask_weight(node_cpumask), 1);
+	return max(cpumask_weight(node_cpumask), 1U);
 }
 
 /* Initialise remaining memory on a node */
_

Patches currently in -mm which might be from echanude@redhat.com are

mm-mm_init-use-nodes-number-of-cpus-in-deferred_page_init_max_threads.patch