3 files changed, 3 insertions, 4 deletions

diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c
index 7599e2625c7d..2a5907b5c8d2 100644
--- a/arch/arm/mm/fault-armv.c
+++ b/arch/arm/mm/fault-armv.c
@@ -134,7 +134,6 @@ make_coherent(struct address_space *mapping, struct vm_area_struct *vma,
 {
         struct mm_struct *mm = vma->vm_mm;
         struct vm_area_struct *mpnt;
-        struct prio_tree_iter iter;
         unsigned long offset;
         pgoff_t pgoff;
         int aliases = 0;
@@ -147,7 +146,7 @@ make_coherent(struct address_space *mapping, struct vm_area_struct *vma,
          * cache coherency.
          */
         flush_dcache_mmap_lock(mapping);
-        vma_prio_tree_foreach(mpnt, &iter, &mapping->i_mmap, pgoff, pgoff) {
+        vma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) {
                 /*
                  * If this VMA is not in our MM, we can ignore it.
                  * Note that we intentionally mask out the VMA
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index c3bd83450227..5dbf13f954f6 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -336,6 +336,7 @@ retry:
                         /* Clear FAULT_FLAG_ALLOW_RETRY to avoid any risk
                         * of starvation. */
                         flags &= ~FAULT_FLAG_ALLOW_RETRY;
+                        flags |= FAULT_FLAG_TRIED;
                         goto retry;
                 }
         }
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 40ca11ed6e5f..1c8f7f564175 100644
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
@@ -196,7 +196,6 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p
 {
         struct mm_struct *mm = current->active_mm;
         struct vm_area_struct *mpnt;
-        struct prio_tree_iter iter;
         pgoff_t pgoff;
 
         /*
@@ -208,7 +207,7 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p
         pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
 
         flush_dcache_mmap_lock(mapping);
-        vma_prio_tree_foreach(mpnt, &iter, &mapping->i_mmap, pgoff, pgoff) {
+        vma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) {
                 unsigned long offset;
 
                 /*