revert-mm-rename-alloc_demote_folio-to-alloc_migrate_folio.patch removed from -mm tree
The quilt patch titled
Subject: Revert "mm: rename alloc_demote_folio to alloc_migrate_folio"
has been removed from the -mm tree. Its filename was
revert-mm-rename-alloc_demote_folio-to-alloc_migrate_folio.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: SeongJae Park <[email protected]>
Subject: Revert "mm: rename alloc_demote_folio to alloc_migrate_folio"
Date: Mon, 16 Jun 2025 10:23:45 -0700
This reverts commit 8f75267d22bdf8e3baf70f2fa7092d8c2f58da71.
Commit 8f75267d22bd ("mm: rename alloc_demote_folio to alloc_migrate_folio") was to reflect the fact the function is called for not only demotion, but also general migrations from DAMOS_MIGRATE_{HOT,COLD}. The previous commit made the DAMOS actions to not use alloc_migrate_folio(), though. So, demote_folio_list() is the only caller of alloc_migrate_folio(), and the name could now be rather confusing. Revert the renaming commit.
---
mm/internal.h | 2 +- mm/vmscan.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
mm/internal.h renamed from mm/internal.h~revert-mm-rename-alloc_demote_folio-to-alloc_migrate_folio +1 -1
@@ -1226,7 +1226,7 @@ extern unsigned long __must_check vm_mm unsigned long, unsigned long);extern void set_pageblock_order (void ); -struct folio *alloc_migrate_folio (struct folio *src,unsigned long private); +struct folio *alloc_demote_folio (struct folio *src,unsigned long private);unsigned long reclaim_pages (struct list_head *folio_list);unsigned int reclaim_clean_pages_from_list (struct zone *zone,struct list_head *folio_list);
mm/vmscan.c renamed from mm/vmscan.c~revert-mm-rename-alloc_demote_folio-to-alloc_migrate_folio +2 -2
@@ -1006,7 +1006,7 @@ static void folio_check_dirty_writeback( mapping->a_ops->is_dirty_writeback (folio, dirty, writeback); } -struct folio *alloc_migrate_folio (struct folio *src,unsigned long private) +struct folio *alloc_demote_folio (struct folio *src,unsigned long private) {struct folio *dst;nodemask_t *allowed_mask;
@@ -1069,7 +1069,7 @@ static unsigned int demote_folio_list(stnode_get_allowed_targets (pgdat, &allowed_mask);/* Demotion ignores all cpuset and mempolicy settings */ -migrate_pages (demote_folios, alloc_migrate_folio,NULL , +migrate_pages (demote_folios, alloc_demote_folio,NULL , (unsigned long )&mtc,MIGRATE_ASYNC ,MR_DEMOTION , &nr_succeeded);
_
Patches currently in -mm which might be from [email protected] are
selftests-damon-add-drgn-script-for-extracting-damon-status.patch selftests-damon-_damon_sysfs-set-kdamondpid-in-start.patch selftests-damon-add-python-and-drgn-based-damon-sysfs-test.patch selftests-damon-sysfspy-test-monitoring-attribute-parameters.patch selftests-damon-sysfspy-test-adaptive-targets-parameter.patch selftests-damon-sysfspy-test-damos-schemes-parameters-setup.patch mm-damon-add-trace-event-for-auto-tuned-monitoring-intervals.patch mm-damon-add-trace-event-for-effective-size-quota.patch mm-damon-add-trace-event-for-effective-size-quota-fix.patch mm-damon-add-trace-event-for-effective-size-quota-fix-2.patch samples-damon-wsse-fix-boot-time-enable-handling.patch samples-damon-prcl-fix-boot-time-enable-crash.patch samples-damon-mtier-support-boot-time-enable-setup.patch mm-damon-reclaim-reset-enabled-when-damon-start-failed.patch mm-damon-lru_sort-reset-enabled-when-damon-start-failed.patch mm-damon-reclaim-use-parameter-context-correctly.patch samples-damon-wsse-rename-to-have-damon_sample_-prefix.patch samples-damon-prcl-rename-to-have-damon_sample_-prefix.patch samples-damon-mtier-rename-to-have-damon_sample_-prefix.patch mm-damon-sysfs-use-damon-core-api-damon_is_running.patch mm-damon-sysfs-dont-hold-kdamond_lock-in-before_terminate.patch docs-mm-damon-maintainer-profile-update-for-mm-new-tree.patch mm-damon-add-struct-damos_migrate_dests.patch mm-damon-core-add-damos-migrate_dests-field.patch mm-damon-sysfs-schemes-implement-damos-action-destinations-directory.patch mm-damon-sysfs-schemes-set-damos-migrate_dests.patch docs-abi-damon-document-schemes-dests-directory.patch docs-admin-guide-mm-damon-usage-document-dests-directory.patch