From 1b0f9f70a30feb9271aad2639c67f44c2129c84d Mon Sep 17 00:00:00 2001 From: Enze Li Date: Fri, 9 Oct 2026 22:20:10 +0800 Subject: [PATCH] mm/hugetlb: move hugetlb_sysfs_initialized into hugetlb_register_all_nodes() hugetlb_sysfs_init() guards the "hugetlb_sysfs_initialized = true" assignment with an #ifdef CONFIG_NUMA block, while the following hugetlb_register_all_nodes() call is left unguarded and relies on the empty !CONFIG_NUMA stub. Move the assignment into the NUMA version of hugetlb_register_all_nodes(), before it registers the online nodes, so the #ifdef in hugetlb_sysfs_init() can go away. Keep the !CONFIG_NUMA stub, so the call site is unconditional in both configurations. No functional change; this is an #ifdef cleanup. Link: https://lore.kernel.org/20261009142010.552614-1-lienze@kylinos.cn Signed-off-by: Enze Li Signed-off-by: Andrew Morton Suggested-by: Muchun Song Acked-by: David Hildenbrand (Arm) Reviewed-by: Muchun Song Cc: Oscar Salvador Cc: Enze Li --- mm/hugetlb_sysfs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/hugetlb_sysfs.c b/mm/hugetlb_sysfs.c index 326a54b4d991..c89e4c847575 100644 --- a/mm/hugetlb_sysfs.c +++ b/mm/hugetlb_sysfs.c @@ -462,6 +462,8 @@ static void __init hugetlb_register_all_nodes(void) { int nid; + hugetlb_sysfs_initialized = true; + for_each_online_node(nid) hugetlb_register_node(node_devices[nid]); } @@ -495,8 +497,5 @@ void __init hugetlb_sysfs_init(void) pr_err("HugeTLB: Unable to add hstate %s\n", h->name); } -#ifdef CONFIG_NUMA - hugetlb_sysfs_initialized = true; -#endif hugetlb_register_all_nodes(); }