4 files changed, 4 insertions, 8 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/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;
 
                 /*
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 9d181890a7e3..48e16dc20102 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -276,7 +276,6 @@ void flush_dcache_page(struct page *page)
 {
         struct address_space *mapping = page_mapping(page);
         struct vm_area_struct *mpnt;
-        struct prio_tree_iter iter;
         unsigned long offset;
         unsigned long addr, old_addr = 0;
         pgoff_t pgoff;
@@ -299,7 +298,7 @@ void flush_dcache_page(struct page *page)
          * to flush one address here for them all to become coherent */
 
         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) {
                 offset = (pgoff - mpnt->vm_pgoff) << PAGE_SHIFT;
                 addr = mpnt->vm_start + offset;
 
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
index b91e48512425..937bff5cdaa7 100644
--- a/arch/x86/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
@@ -71,7 +71,6 @@ huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)
         struct address_space *mapping = vma->vm_file->f_mapping;
         pgoff_t idx = ((addr - vma->vm_start) >> PAGE_SHIFT) +
                         vma->vm_pgoff;
-        struct prio_tree_iter iter;
         struct vm_area_struct *svma;
         unsigned long saddr;
         pte_t *spte = NULL;
@@ -81,7 +80,7 @@ huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)
                 return (pte_t *)pmd_alloc(mm, pud, addr);
 
         mutex_lock(&mapping->i_mmap_mutex);
-        vma_prio_tree_foreach(svma, &iter, &mapping->i_mmap, idx, idx) {
+        vma_interval_tree_foreach(svma, &mapping->i_mmap, idx, idx) {
                 if (svma == vma)
                         continue;