2 files changed, 2 insertions, 17 deletions

diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index 830e65dc01ee..590c291a8cd9 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -218,20 +218,7 @@ int try_to_munlock(struct page *);
 /*
  * Called by memory-failure.c to kill processes.
  */
-struct anon_vma *__page_lock_anon_vma(struct page *page);
-
-static inline struct anon_vma *page_lock_anon_vma(struct page *page)
-{
-        struct anon_vma *anon_vma;
-
-        __cond_lock(RCU, anon_vma = __page_lock_anon_vma(page));
-
-        /* (void) is needed to make gcc happy */
-        (void) __cond_lock(&anon_vma->root->lock, anon_vma);
-
-        return anon_vma;
-}
-
+struct anon_vma *page_lock_anon_vma(struct page *page);
 void page_unlock_anon_vma(struct anon_vma *anon_vma);
 int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma);
 
diff --git a/mm/rmap.c b/mm/rmap.c
index f0ef7ea5423a..c6044761617e 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -323,7 +323,7 @@ void __init anon_vma_init(void)
  * Getting a lock on a stable anon_vma from a page off the LRU is
  * tricky: page_lock_anon_vma rely on RCU to guard against the races.
  */
-struct anon_vma *__page_lock_anon_vma(struct page *page)
+struct anon_vma *page_lock_anon_vma(struct page *page)
 {
         struct anon_vma *anon_vma, *root_anon_vma;
         unsigned long anon_mapping;
@@ -357,8 +357,6 @@ out:
 }
 
 void page_unlock_anon_vma(struct anon_vma *anon_vma)
-        __releases(&anon_vma->root->lock)
-        __releases(RCU)
 {
         anon_vma_unlock(anon_vma);
         rcu_read_unlock();