The patch titled
Subject: ksm: add cond_resched() to the rmap_walks
has been removed from the -mm tree. Its filename was
ksm-add-cond_resched-to-the-rmap_walks.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Subject: ksm: add cond_resched() to the rmap_walks
While at it add it to the file and anon walks too.
Signed-off-by: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Acked-by: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Petr Holasek <pholasek@xxxxxxxxxx>
Acked-by: Davidlohr Bueso <dbueso@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/ksm.c | 2 ++
mm/rmap.c | 4 ++++
2 files changed, 6 insertions(+)
diff -puN mm/ksm.c~ksm-add-cond_resched-to-the-rmap_walks mm/ksm.c
--- a/mm/ksm.c~ksm-add-cond_resched-to-the-rmap_walks
+++ a/mm/ksm.c
@@ -1914,9 +1914,11 @@ again:
struct anon_vma_chain *vmac;
struct vm_area_struct *vma;
+ cond_resched();
anon_vma_lock_read(anon_vma);
anon_vma_interval_tree_foreach(vmac, &anon_vma->rb_root,
0, ULONG_MAX) {
+ cond_resched();
vma = vmac->vma;
if (rmap_item->address < vma->vm_start ||
rmap_item->address >= vma->vm_end)
diff -puN mm/rmap.c~ksm-add-cond_resched-to-the-rmap_walks mm/rmap.c
--- a/mm/rmap.c~ksm-add-cond_resched-to-the-rmap_walks
+++ a/mm/rmap.c
@@ -1609,6 +1609,8 @@ static int rmap_walk_anon(struct page *p
struct vm_area_struct *vma = avc->vma;
unsigned long address = vma_address(page, vma);
+ cond_resched();
+
if (rwc->invalid_vma && rwc->invalid_vma(vma, rwc->arg))
continue;
@@ -1658,6 +1660,8 @@ static int rmap_walk_file(struct page *p
vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff) {
unsigned long address = vma_address(page, vma);
+ cond_resched();
+
if (rwc->invalid_vma && rwc->invalid_vma(vma, rwc->arg))
continue;
_
Patches currently in -mm which might be from aarcange@xxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
