Skip to contentSkip to conversation

mm-migrate-removed-unused-argument-vma-from-migrate_misplaced_folio.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 14, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: migrate: remove unused argument vma from migrate_misplaced_folio()
has been removed from the -mm tree. Its filename was
mm-migrate-removed-unused-argument-vma-from-migrate_misplaced_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: Donet Tom <[email protected]>
Subject: mm: migrate: remove unused argument vma from migrate_misplaced_folio()
Date: Tue, 26 Nov 2024 09:56:54 -0600

Commit ee86814b0562 ("mm/migrate: move NUMA hinting fault folio isolation
+ checks under PTL") removed the code that had used the vma argument in migrate_misplaced_folio.

Since the vma argument was no longer used in migrate_misplaced_folio, this patch removes it.

---

 include/linux/migrate.h |    6 ++----
 mm/huge_memory.c        |    2 +-
 mm/memory.c             |    2 +-
 mm/migrate.c            |    3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)
include/linux/migrate.h renamed from include/linux/migrate.h~mm-migrate-removed-unused-argument-vma-from-migrate_misplaced_folio +2 -4
@@ -144,16 +144,14 @@ const struct movable_operations *page_mo
 #ifdef CONFIG_NUMA_BALANCING
 int migrate_misplaced_folio_prepare(struct folio *folio,
 		struct vm_area_struct *vma, int node);
-int migrate_misplaced_folio(struct folio *folio, struct vm_area_struct *vma,
-			   int node);
+int migrate_misplaced_folio(struct folio *folio, int node);
 #else
 static inline int migrate_misplaced_folio_prepare(struct folio *folio,
 		struct vm_area_struct *vma, int node)
 {
 	return -EAGAIN; /* can't migrate now */
 }
-static inline int migrate_misplaced_folio(struct folio *folio,
-					 struct vm_area_struct *vma, int node)
+static inline int migrate_misplaced_folio(struct folio *folio, int node)
 {
 	return -EAGAIN; /* can't migrate now */
 }
mm/huge_memory.c renamed from mm/huge_memory.c~mm-migrate-removed-unused-argument-vma-from-migrate_misplaced_folio +1 -1
@@ -2003,7 +2003,7 @@ vm_fault_t do_huge_pmd_numa_page(struct
 	spin_unlock(vmf->ptl);
 	writable = false;
 
-	if (!migrate_misplaced_folio(folio, vma, target_nid)) {
+	if (!migrate_misplaced_folio(folio, target_nid)) {
 		flags |= TNF_MIGRATED;
 		nid = target_nid;
 		task_numa_fault(last_cpupid, nid, HPAGE_PMD_NR, flags);
mm/memory.c renamed from mm/memory.c~mm-migrate-removed-unused-argument-vma-from-migrate_misplaced_folio +1 -1
@@ -5625,7 +5625,7 @@ static vm_fault_t do_numa_page(struct vm
 	ignore_writable = true;
 
 	/* Migrate to the requested node */
-	if (!migrate_misplaced_folio(folio, vma, target_nid)) {
+	if (!migrate_misplaced_folio(folio, target_nid)) {
 		nid = target_nid;
 		flags |= TNF_MIGRATED;
 		task_numa_fault(last_cpupid, nid, nr_pages, flags);
mm/migrate.c renamed from mm/migrate.c~mm-migrate-removed-unused-argument-vma-from-migrate_misplaced_folio +1 -2
@@ -2683,8 +2683,7 @@ int migrate_misplaced_folio_prepare(stru
  * elevated reference count on the folio. This function will un-isolate the
  * folio, dereferencing the folio before returning.
  */
-int migrate_misplaced_folio(struct folio *folio, struct vm_area_struct *vma,
-			    int node)
+int migrate_misplaced_folio(struct folio *folio, int node)
 {
 	pg_data_t *pgdat = NODE_DATA(node);
 	int nr_remaining;

_

Patches currently in -mm which might be from [email protected] are