mm-handle-hashdist-initialization-in-mm-mm_initc.patch removed from -mm tree
The quilt patch titled
Subject: mm: handle hashdist initialization in mm/mm_init.c
has been removed from the -mm tree. Its filename was
mm-handle-hashdist-initialization-in-mm-mm_initc.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (IBM)" <[email protected]>
Subject: mm: handle hashdist initialization in mm/mm_init.c
Date: Tue, 21 Mar 2023 19:05:03 +0200
The hashdist variable must be initialized before the first call to alloc_large_system_hash() and free_area_init() looks like a better place for it than page_alloc_init().
Move hashdist handling to mm/mm_init.c
---
mm/mm_init.c | 22 ++++++++++++++++++++++ mm/page_alloc.c | 18 ------------------ 2 files changed, 22 insertions(+), 18 deletions(-)
mm/mm_init.c renamed from mm/mm_init.c~mm-handle-hashdist-initialization-in-mm-mm_initc +22 -0
@@ -607,6 +607,25 @@ int __meminit early_pfn_to_nid(unsigned return nid; } + +int hashdist =HASHDIST_DEFAULT ; + +static int __init set_hashdist (char *str) +{ +if (!str) +return 0 ; + hashdist =simple_strtoul (str, &str,0 ); +return 1 ; +} +__setup ("hashdist=" , set_hashdist); + +static inline void fixup_hashdist (void ) +{ +if (num_node_state (N_MEMORY ) ==1 ) + hashdist =0 ; +} +#else +static inline void fixup_hashdist (void ) {}#endif /* CONFIG_NUMA */ #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
@@ -1855,6 +1874,9 @@ void __init free_area_init(unsigned long }memmap_init (); + +/* disable hash distribution for systems with a single node */ +fixup_hashdist (); }/**
mm/page_alloc.c renamed from mm/page_alloc.c~mm-handle-hashdist-initialization-in-mm-mm_initc +0 -18
@@ -6393,28 +6393,10 @@ static int page_alloc_cpu_online(unsignereturn 0 ; } -#ifdef CONFIG_NUMA -int hashdist =HASHDIST_DEFAULT ; - -static int __init set_hashdist (char *str) -{ -if (!str) -return 0 ; - hashdist =simple_strtoul (str, &str,0 ); -return 1 ; -} -__setup ("hashdist=" , set_hashdist); -#endif -void __init page_alloc_init (void ) {int ret; -#ifdef CONFIG_NUMA -if (num_node_state (N_MEMORY ) ==1 ) - hashdist =0 ; -#endif - ret = cpuhp_setup_state_nocalls(CPUHP_PAGE_ALLOC, "mm/page_alloc:pcp", page_alloc_cpu_online,
_
Patches currently in -mm which might be from [email protected] are
arm-reword-arch_force_max_order-prompt-and-help-text.patch arm64-drop-ranges-in-definition-of-arch_force_max_order.patch arm64-reword-arch_force_max_order-prompt-and-help-text.patch arm64-reword-arch_force_max_order-prompt-and-help-text-v3.patch csky-drop-arch_force_max_order.patch ia64-dont-allow-users-to-override-arch_force_max_order.patch m68k-reword-arch_force_max_order-prompt-and-help-text.patch nios2-reword-arch_force_max_order-prompt-and-help-text.patch nios2-drop-ranges-for-definition-of-arch_force_max_order.patch powerpc-reword-arch_force_max_order-prompt-and-help-text.patch powerpc-drop-ranges-for-definition-of-arch_force_max_order.patch sh-reword-arch_force_max_order-prompt-and-help-text.patch sh-reword-arch_force_max_order-prompt-and-help-text-v3.patch sh-drop-ranges-for-definition-of-arch_force_max_order.patch sh-drop-ranges-for-definition-of-arch_force_max_order-v3.patch sparc-reword-arch_force_max_order-prompt-and-help-text.patch xtensa-reword-arch_force_max_order-prompt-and-help-text.patch mm-move-free_area_empty-to-mm-internalh.patch