The patch titled Subject: mm-hugetlb-sort-out-global-lock-annotations-fix-fix has been added to the -mm mm-unstable branch. Its filename is mm-hugetlb-sort-out-global-lock-annotations-fix-fix.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-hugetlb-sort-out-global-lock-annotations-fix-fix.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm 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 via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-hugetlb-sort-out-global-lock-annotations-fix-fix Date: Wed Aug 28 01:40:09 PM PDT 2024 DEFINE_SPINLOCK doesn't permit section modifiers at end-of-definition Cc: Davidlohr Bueso <dave@xxxxxxxxxxxx> Cc: Mateusz Guzik <mjguzik@xxxxxxxxx> Cc: Muchun Song <muchun.song@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/hugetlb.c~mm-hugetlb-sort-out-global-lock-annotations-fix-fix +++ a/mm/hugetlb.c @@ -72,7 +72,7 @@ static unsigned int default_hugepages_in * Protects updates to hugepage_freelists, hugepage_activelist, nr_huge_pages, * free_huge_pages, and surplus_huge_pages. */ -DEFINE_SPINLOCK(hugetlb_lock) __cacheline_aligned_in_smp; +__cacheline_aligned_in_smp DEFINE_SPINLOCK(hugetlb_lock); /* * Serializes faults on the same logical page. This is used to _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are include-linux-mmzoneh-clean-up-watermark-accessors.patch mm-remove-legacy-install_special_mapping-code-checkpatch-fixes.patch mm-contig_alloc-support-__gfp_comp-fix.patch selftests-mm-add-more-mseal-traversal-tests-fix.patch mm-remove-pageactive-fix.patch selftests-test_zswap-add-test-for-hierarchical-zswapwriteback-fix.patch mm-count-the-number-of-anonymous-thps-per-size-fix.patch mm-shmem-extend-shmem_unused_huge_shrink-to-all-sizes-fix.patch mm-hugetlb-sort-out-global-lock-annotations-fix.patch mm-hugetlb-sort-out-global-lock-annotations-fix-fix.patch fault-inject-improve-build-for-config_fault_injection=n-fix.patch fault-inject-improve-build-for-config_fault_injection=n-fix-2.patch fault-inject-improve-build-for-config_fault_injection=n-fix-3.patch