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@xxxxxxxxxx>
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@xxxxxxxxxx
Signed-off-by: Eric Chanudet <echanude@xxxxxxxxxx>
Tested-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> (powerpc)
Cc: Andy Lutomirski <luto@xxxxxxxxxx>
Cc: Baoquan He <bhe@xxxxxxxxxx>
Cc: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Mike Rapoport (IBM) <rppt@xxxxxxxxxx>
Cc: Nicholas Piggin <npiggin@xxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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@xxxxxxxxxx are
mm-mm_init-use-nodes-number-of-cpus-in-deferred_page_init_max_threads.patch
