aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-05-24 20:12:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 11:39:18 -0400
commit25aeeb046e695c3093a86aa9386128ffb3b1bc32 (patch)
tree3ccd60d5459baa4dc4d0245d764a7cae2496c876 /mm
parent3d48ae45e72390ddf8cc5256ac32ed6f7a19cbea (diff)
mm: revert page_lock_anon_vma() lock annotation
Its beyond ugly and gets in the way. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Hugh Dickins <hughd@google.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: David Miller <davem@davemloft.net> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Jeff Dike <jdike@addtoit.com> Cc: Richard Weinberger <richard@nod.at> Cc: Tony Luck <tony.luck@intel.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Namhyung Kim <namhyung@gmail.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Nick Piggin <npiggin@kernel.dk> Cc: Namhyung Kim <namhyung@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/rmap.c4
1 files changed, 1 insertions, 3 deletions
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)
323 * Getting a lock on a stable anon_vma from a page off the LRU is 323 * Getting a lock on a stable anon_vma from a page off the LRU is
324 * tricky: page_lock_anon_vma rely on RCU to guard against the races. 324 * tricky: page_lock_anon_vma rely on RCU to guard against the races.
325 */ 325 */
326struct anon_vma *__page_lock_anon_vma(struct page *page) 326struct anon_vma *page_lock_anon_vma(struct page *page)
327{ 327{
328 struct anon_vma *anon_vma, *root_anon_vma; 328 struct anon_vma *anon_vma, *root_anon_vma;
329 unsigned long anon_mapping; 329 unsigned long anon_mapping;
@@ -357,8 +357,6 @@ out:
357} 357}
358 358
359void page_unlock_anon_vma(struct anon_vma *anon_vma) 359void page_unlock_anon_vma(struct anon_vma *anon_vma)
360 __releases(&anon_vma->root->lock)
361 __releases(RCU)
362{ 360{
363 anon_vma_unlock(anon_vma); 361 anon_vma_unlock(anon_vma);
364 rcu_read_unlock(); 362 rcu_read_unlock();