The quilt patch titled
Subject: mm-ksm-introduce-ksm_force-for-each-process-fix
has been removed from the -mm tree. Its filename was
mm-ksm-introduce-ksm_force-for-each-process-fix.patch
This patch was dropped because it was folded into mm-ksm-introduce-ksm_force-for-each-process.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-ksm-introduce-ksm_force-for-each-process-fix
rename ksm_vma_check() to vma_scannable()
Cc: Ammar Faizi <ammarfaizi2@xxxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Ran Xiaokai <ran.xiaokai@xxxxxxxxxx>
Cc: wangyong <wang.yong12@xxxxxxxxxx>
Cc: xu xin <xu.xin16@xxxxxxxxxx>
Cc: Yang Yang <yang.yang29@xxxxxxxxxx>
Cc: Yunkai Zhang <zhang.yunkai@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/ksm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/mm/ksm.c~mm-ksm-introduce-ksm_force-for-each-process-fix
+++ a/mm/ksm.c
@@ -335,7 +335,7 @@ static void __init ksm_slab_free(void)
}
/* Check if vma is qualified for ksmd scanning */
-static bool ksm_vma_check(struct vm_area_struct *vma)
+static bool vma_scannable(struct vm_area_struct *vma)
{
unsigned long vm_flags = vma->vm_flags;
@@ -551,7 +551,7 @@ static struct vm_area_struct *find_merge
if (ksm_test_exit(mm))
return NULL;
vma = vma_lookup(mm, addr);
- if (!vma || !ksm_vma_check(vma) || !vma->anon_vma)
+ if (!vma || !vma_scannable(vma) || !vma->anon_vma)
return NULL;
return vma;
}
@@ -2328,7 +2328,7 @@ next_mm:
goto no_vmas;
for_each_vma(vmi, vma) {
- if (!ksm_vma_check(vma))
+ if (!vma_scannable(vma))
continue;
if (ksm_scan.address < vma->vm_start)
ksm_scan.address = vma->vm_start;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
assoc_array-fix-bug_on-during-garbage-collect-fix.patch
mm-check-against-orig_pte-for-finish_fault-fix-checkpatch-fixes.patch
mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix.patch
lib-kstrtoxc-add-false-true-support-to-kstrtobool-fix.patch
mm-start-tracking-vmas-with-maple-tree-fix.patch
damon-convert-__damon_va_three_regions-to-use-the-vma-iterator-fix.patch
mm-rmap-fix-cont-pte-pmd-size-hugetlb-issue-when-migration-fix.patch
mm-page_alloc-remotely-drain-per-cpu-lists-checkpatch-fixes.patch
mm-ksm-introduce-ksm_force-for-each-process.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
mm-oom_killc-fix-vm_oom_kill_table-ifdeffery.patch
