The patch titled Subject: mm-page_alloc-keep-track-of-free-highatomic-fix has been added to the -mm mm-hotfixes-unstable branch. Its filename is mm-page_alloc-keep-track-of-free-highatomic-fix.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-page_alloc-keep-track-of-free-highatomic-fix.patch This patch will later appear in the mm-hotfixes-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-page_alloc-keep-track-of-free-highatomic-fix Date: Tue Oct 29 05:37:30 PM PDT 2024 s/if/else if/, per Johannes, stealth whitespace tweak Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Link Lin <linkl@xxxxxxxxxx> Cc: Vlastimil Babka <vbabka@xxxxxxx> Cc: Yu Zhao <yuzhao@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/mm/page_alloc.c~mm-page_alloc-keep-track-of-free-highatomic-fix +++ a/mm/page_alloc.c @@ -644,9 +644,9 @@ static inline void account_freepages(str if (is_migrate_cma(migratetype)) __mod_zone_page_state(zone, NR_FREE_CMA_PAGES, nr_pages); - - if (is_migrate_highatomic(migratetype)) - WRITE_ONCE(zone->nr_free_highatomic, zone->nr_free_highatomic + nr_pages); + else if (is_migrate_highatomic(migratetype)) + WRITE_ONCE(zone->nr_free_highatomic, + zone->nr_free_highatomic + nr_pages); } /* Used for pages not on another list */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-page_alloc-keep-track-of-free-highatomic-fix.patch mm-consolidate-common-checks-in-hugetlb_get_unmapped_area-fix.patch mm-memoryc-remove-stray-newline-at-top-of-file.patch bootmem-stop-using-page-index-fix.patch mm-kasan-kmsan-copy_from-to_kernel_nofault-fix.patch tools-mm-free-the-allocated-memory-fix.patch memcg-v1-no-need-for-memcg-locking-for-mglru-fix.patch mm-vma-the-pgoff-is-correct-if-can_merge_right-fix.patch memcg-workingset-remove-folio_memcg_rcu-usage-fix.patch