From: Brendan Jackman Date: Thu, 21 Aug 2025 13:29:47 +0000 (+0000) Subject: mm: remove is_migrate_highatomic() X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce32123b9bc02bb4cd343fa03d1b8bb7f9ce9c51;p=thirdparty%2Fkernel%2Fstable.git mm: remove is_migrate_highatomic() There are 3 potential reasons for is_migrate_*() helpers: 1. They represent higher-level attributes of migratetypes, like is_migrate_movable() 2. They are ifdef'd, like is_migrate_isolate(). 3. For consistency with an is_migrate_*_page() helper, also like is_migrate_isolate(). It looks like is_migrate_highatomic() was for case 3, but that was removed in commit e0932b6c1f94 ("mm: page_alloc: consolidate free page accounting"). So remove the indirection and go back to a simple comparison. Link: https://lkml.kernel.org/r/20250821-is-migrate-highatomic-v1-1-ddb6e5d7c566@google.com Signed-off-by: Brendan Jackman Reviewed-by: Zi Yan Acked-by: David Hildenbrand Acked-by: Johannes Weiner Reviewed-by: Lorenzo Stoakes Acked-by: SeongJae Park Cc: Liam Howlett Cc: Michal Hocko Cc: Mike Rapoport Cc: Suren Baghdasaryan Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- diff --git a/mm/internal.h b/mm/internal.h index 45b725c3dc030..45da9ff5694f6 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1333,11 +1333,6 @@ extern const struct trace_print_flags pageflag_names[]; extern const struct trace_print_flags vmaflag_names[]; extern const struct trace_print_flags gfpflag_names[]; -static inline bool is_migrate_highatomic(enum migratetype migratetype) -{ - return migratetype == MIGRATE_HIGHATOMIC; -} - void setup_zone_pageset(struct zone *zone); struct migration_target_control { diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ca9e6b9633f79..baead29b3e67b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -797,7 +797,7 @@ static inline void account_freepages(struct zone *zone, int nr_pages, if (is_migrate_cma(migratetype)) __mod_zone_page_state(zone, NR_FREE_CMA_PAGES, nr_pages); - else if (is_migrate_highatomic(migratetype)) + else if (migratetype == MIGRATE_HIGHATOMIC) WRITE_ONCE(zone->nr_free_highatomic, zone->nr_free_highatomic + nr_pages); }