1 files changed, 5 insertions, 3 deletions

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index a6e2141a6610..6c5899b9034a 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -400,18 +400,21 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill,
         struct vm_area_struct *vma;
         struct task_struct *tsk;
         struct anon_vma *av;
+        pgoff_t pgoff;
 
         av = page_lock_anon_vma(page);
         if (av == NULL) /* Not actually mapped anymore */
                 return;
 
+        pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
         read_lock(&tasklist_lock);
         for_each_process (tsk) {
                 struct anon_vma_chain *vmac;
 
                 if (!task_early_kill(tsk))
                         continue;
-                list_for_each_entry(vmac, &av->head, same_anon_vma) {
+                anon_vma_interval_tree_foreach(vmac, &av->rb_root,
+                                               pgoff, pgoff) {
                         vma = vmac->vma;
                         if (!page_mapped_in_vma(page, vma))
                                 continue;
@@ -431,7 +434,6 @@ static void collect_procs_file(struct page *page, struct list_head *to_kill,
 {
         struct vm_area_struct *vma;
         struct task_struct *tsk;
-        struct prio_tree_iter iter;
         struct address_space *mapping = page->mapping;
 
         mutex_lock(&mapping->i_mmap_mutex);
@@ -442,7 +444,7 @@ static void collect_procs_file(struct page *page, struct list_head *to_kill,
                 if (!task_early_kill(tsk))
                         continue;
 
-                vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff,
+                vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff,
                                       pgoff) {
                         /*
                          * Send early kill signal to tasks where a vma covers