2 files changed, 9 insertions, 9 deletions

diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index 77216742c178..80cd162a8aa6 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -99,14 +99,14 @@ static inline struct anon_vma *page_anon_vma(struct page *page)
         return page_rmapping(page);
 }
 
-static inline void anon_vma_lock(struct vm_area_struct *vma)
+static inline void vma_lock_anon_vma(struct vm_area_struct *vma)
 {
         struct anon_vma *anon_vma = vma->anon_vma;
         if (anon_vma)
                 spin_lock(&anon_vma->lock);
 }
 
-static inline void anon_vma_unlock(struct vm_area_struct *vma)
+static inline void vma_unlock_anon_vma(struct vm_area_struct *vma)
 {
         struct anon_vma *anon_vma = vma->anon_vma;
         if (anon_vma)
diff --git a/mm/mmap.c b/mm/mmap.c
index e38e910cb756..e26f1ea7c904 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -452,12 +452,12 @@ static void vma_link(struct mm_struct *mm, struct vm_area_struct *vma,
                 spin_lock(&mapping->i_mmap_lock);
                 vma->vm_truncate_count = mapping->truncate_count;
         }
-        anon_vma_lock(vma);
+        vma_lock_anon_vma(vma);
 
         __vma_link(mm, vma, prev, rb_link, rb_parent);
         __vma_link_file(vma);
 
-        anon_vma_unlock(vma);
+        vma_unlock_anon_vma(vma);
         if (mapping)
                 spin_unlock(&mapping->i_mmap_lock);
 
@@ -1710,7 +1710,7 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
          */
         if (unlikely(anon_vma_prepare(vma)))
                 return -ENOMEM;
-        anon_vma_lock(vma);
+        vma_lock_anon_vma(vma);
 
         /*
          * vma->vm_start/vm_end cannot change under us because the caller
@@ -1721,7 +1721,7 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
         if (address < PAGE_ALIGN(address+4))
                 address = PAGE_ALIGN(address+4);
         else {
-                anon_vma_unlock(vma);
+                vma_unlock_anon_vma(vma);
                 return -ENOMEM;
         }
         error = 0;
@@ -1739,7 +1739,7 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
                         perf_event_mmap(vma);
                 }
         }
-        anon_vma_unlock(vma);
+        vma_unlock_anon_vma(vma);
         return error;
 }
 #endif /* CONFIG_STACK_GROWSUP || CONFIG_IA64 */
@@ -1764,7 +1764,7 @@ static int expand_downwards(struct vm_area_struct *vma,
         if (error)
                 return error;
 
-        anon_vma_lock(vma);
+        vma_lock_anon_vma(vma);
 
         /*
          * vma->vm_start/vm_end cannot change under us because the caller
@@ -1786,7 +1786,7 @@ static int expand_downwards(struct vm_area_struct *vma,
                         perf_event_mmap(vma);
                 }
         }
-        anon_vma_unlock(vma);
+        vma_unlock_anon_vma(vma);
         return error;
 }