The patch titled Subject: hugetlb: clean up hugetlb_cma_reserve has been added to the -mm tree. Its filename is hugetlb-clean-up-hugetlb_cma_reserve.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/hugetlb-clean-up-hugetlb_cma_reserve.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/hugetlb-clean-up-hugetlb_cma_reserve.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Peng Liu <liupeng256@xxxxxxxxxx> Subject: hugetlb: clean up hugetlb_cma_reserve Use more generic functions to deal with issues related to online nodes. The changes will make the code simplified. Link: https://lkml.kernel.org/r/20220413032915.251254-5-liupeng256@xxxxxxxxxx Signed-off-by: Peng Liu <liupeng256@xxxxxxxxxx> Cc: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx> Cc: David Hildenbrand <david@xxxxxxxxxx> Cc: Liu Yuntao <liuyuntao10@xxxxxxxxxx> Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx> Cc: Muchun Song <songmuchun@xxxxxxxxxxxxx> Cc: Zhenguo Yao <yaozhenguo1@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- --- a/mm/hugetlb.c~hugetlb-clean-up-hugetlb_cma_reserve +++ a/mm/hugetlb.c @@ -7026,7 +7026,7 @@ void __init hugetlb_cma_reserve(int orde if (hugetlb_cma_size_in_node[nid] == 0) continue; - if (!node_state(nid, N_ONLINE)) { + if (!node_online(nid)) { pr_warn("hugetlb_cma: invalid node %d specified\n", nid); hugetlb_cma_size -= hugetlb_cma_size_in_node[nid]; hugetlb_cma_size_in_node[nid] = 0; @@ -7065,7 +7065,7 @@ void __init hugetlb_cma_reserve(int orde } reserved = 0; - for_each_node_state(nid, N_ONLINE) { + for_each_online_node(nid) { int res; char name[CMA_MAX_NAME]; _ Patches currently in -mm which might be from liupeng256@xxxxxxxxxx are hugetlb-fix-wrong-use-of-nr_online_nodes.patch hugetlb-fix-hugepages_setup-when-deal-with-pernode.patch hugetlb-fix-return-value-of-__setup-handlers.patch hugetlb-clean-up-hugetlb_cma_reserve.patch