From 3e5d67dccefa75171228b3292ce1ac6d4054020a Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue, 24 May 2011 17:12:07 -0700
Subject: [PATCH] --- yaml --- r: 250896 b: refs/heads/master c:
 25aeeb046e695c3093a86aa9386128ffb3b1bc32 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/rmap.h | 15 +--------------
 trunk/mm/rmap.c            |  4 +---
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 61803abd6efa..f3df5761d74c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d48ae45e72390ddf8cc5256ac32ed6f7a19cbea
+refs/heads/master: 25aeeb046e695c3093a86aa9386128ffb3b1bc32
diff --git a/trunk/include/linux/rmap.h b/trunk/include/linux/rmap.h
index 830e65dc01ee..590c291a8cd9 100644
--- a/trunk/include/linux/rmap.h
+++ b/trunk/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/trunk/mm/rmap.c b/trunk/mm/rmap.c
index f0ef7ea5423a..c6044761617e 100644
--- a/trunk/mm/rmap.c
+++ b/trunk/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 @@ struct anon_vma *__page_lock_anon_vma(struct page *page)
 }
 
 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();